fixes bug 219400 "remove callers of nsServiceManager:: methods" r=bsmedberg

git-svn-id: svn://10.0.0.236/trunk@165089 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webshell/tests/viewer/nsBrowserWindow.cpp

@@ -969,9 +969,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
   nsIPresShell* shell;
   shell = nsnull;
   shell = GetPresShell();
-  res = nsServiceManager::GetService(kWalletServiceCID,
-                                     kIWalletServiceIID,
-                                     (nsISupports **)&walletservice);
+  res = CallGetService(kWalletServiceCID, &walletservice);
   if ((NS_OK == res) && (nsnull != walletservice)) {
     nsString urlString2;
 //    res = walletservice->WALLET_Prefill(shell, (PRVCY_QPREFILL == aID));
@@ -995,9 +993,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
 
 
   /* set a cookie for the javascript wallet editor */
-  res = nsServiceManager::GetService(kWalletServiceCID,
-                                     kIWalletServiceIID,
-                                     (nsISupports **)&walletservice);
+  res = CallGetService(kWalletServiceCID, &walletservice);
   if ((NS_OK == res) && (nsnull != walletservice)) {
     nsIURI * url;
     nsCOMPtr<nsIIOService> service(do_GetService(kIOServiceCID, &res));
@@ -1031,9 +1027,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
 
 #if defined(SingleSignon)
   case PRVCY_DISPLAY_SIGNONS:
-  res = nsServiceManager::GetService(kWalletServiceCID,
-                                     kIWalletServiceIID,
-                                     (nsISupports **)&walletservice);
+  res = CallGetService(kWalletServiceCID, &walletservice);
   if ((NS_OK == res) && (nsnull != walletservice)) {
 //    res = walletservice->SI_DisplaySignonInfoAsHTML();
     NS_RELEASE(walletservice);
@@ -1215,8 +1209,7 @@ GetTitleSuffix(void)
 {
   nsString* suffix = new nsString(" - Failed");
   nsIStringBundleService* service = nsnull;
-  nsresult ret = nsServiceManager::GetService(kStringBundleServiceCID,
-    kIStringBundleServiceIID, (nsISupports**) &service);
+  nsresult ret = CallGetService(kStringBundleServiceCID, &service);
   if (NS_FAILED(ret)) {
     return suffix;
   }

mozilla/webshell/tests/viewer/nsViewerApp.cpp

@@ -204,51 +204,6 @@ nsViewerApp::Destroy()
   NS_IF_RELEASE(mPrefService);
 }
 
-class nsTestFormProcessor : public nsIFormProcessor {
-public:
-  nsTestFormProcessor();
-  NS_IMETHOD ProcessValue(nsIDOMHTMLElement *aElement, 
-                          const nsString& aName, 
-                          nsString& aValue);
-
-  NS_IMETHOD ProvideContent(const nsString& aFormType, 
-                            nsVoidArray& aContent,
-                            nsString& aAttribute);
-  NS_DECL_ISUPPORTS
-};
-
-
-
-NS_IMPL_ISUPPORTS1(nsTestFormProcessor, nsIFormProcessor)
-
-nsTestFormProcessor::nsTestFormProcessor()
-{
-}
-
-NS_METHOD 
-nsTestFormProcessor::ProcessValue(nsIDOMHTMLElement *aElement, 
-                                  const nsString& aName, 
-                                  nsString& aValue)
-{
-#ifdef DEBUG_kmcclusk
-  char *name = ToNewCString(aName);
-  char *value = ToNewCString(aValue);
-  printf("ProcessValue: name %s value %s\n",  name, value);
-  delete [] name;
-  delete [] value;
-#endif
-
-  return NS_OK;
-}
-
-NS_METHOD nsTestFormProcessor::ProvideContent(const nsString& aFormType, 
-                               nsVoidArray& aContent,
-                               nsString& aAttribute)
-{
-  return NS_OK;
-}
-
-
 nsresult
 nsViewerApp::SetupRegistry()
 {
@@ -275,15 +230,6 @@ nsViewerApp::SetupRegistry()
 #endif
   }
 
-   // Register a form processor. The form processor has the opportunity to
-   // modify the value's passed during form submission.
-  nsTestFormProcessor* testFormProcessor = new nsTestFormProcessor();
-  nsCOMPtr<nsISupports> formProcessor;
-  rv = testFormProcessor->QueryInterface(kISupportsIID, getter_AddRefs(formProcessor));
-  if (NS_SUCCEEDED(rv) && formProcessor) {
-    rv = nsServiceManager::RegisterService(kFormProcessorCID, formProcessor);
-  }
-
   return NS_OK;
 }
 
@@ -356,9 +302,6 @@ nsViewerApp::Exit()
     NS_RELEASE(mAppShell);
   }
 
-    // Unregister the test form processor registered in nsViewerApp::SetupRegistry
-  rv = nsServiceManager::UnregisterService(kFormProcessorCID);
-
   return rv;
 }
 

mozilla/webshell/tests/viewer/nsWebCrawler.cpp

@@ -985,16 +985,13 @@ static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
 static nsresult
 QueueEvent(PLEvent* aEvent)
 {
-  nsISupports* is;
-  nsresult rv = nsServiceManager::GetService(kEventQueueServiceCID,
-                                             kIEventQueueServiceIID,
-                                             &is,
-                                             nsnull);
+  nsresult rv;
+  nsCOMPtr<nsIEventQueueService> eqs =
+      do_GetService(kEventQueueServiceCID, &rv);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
-  nsCOMPtr<nsIEventQueueService> eqs = do_QueryInterface(is);
   if (eqs) {
     nsCOMPtr<nsIEventQueue> eq;
     rv = eqs->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eq));
@@ -1003,7 +1000,6 @@ QueueEvent(PLEvent* aEvent)
     }
   }
 
-  nsServiceManager::ReleaseService(kEventQueueServiceCID, is, nsnull);
   return rv;
 }