Backed out changeset af956e9c02e3

dom/ipc/ContentParent.cpp

@@ -53,8 +53,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsChromeRegistryChrome.h"
-#include "nsExternalHelperAppService.h"
-#include "nsCExternalHandlerService.h"
 
 #ifdef ANDROID
 #include "AndroidBridge.h"
@@ -472,16 +470,6 @@ ContentParent::RecvSetURITitle(const IPC::URI& uri,
     return true;
 }
 
-bool
-ContentParent::RecvLoadURIExteneral(const URI& uri)
-{
-    nsCOMPtr<nsIExternalProtocolService> extProtService (do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID));
-    nsCOMPtr<nsIURI> ourURI = uri;
-    extProtService->LoadURI(ourURI, nsnull);
-    return true;
-}
-
-
 /* void onDispatchedEvent (in nsIThreadInternal thread); */
 NS_IMETHODIMP
 ContentParent::OnDispatchedEvent(nsIThreadInternal *thread)

dom/ipc/ContentParent.h

@@ -155,8 +155,6 @@ private:
     virtual bool RecvSetURITitle(const IPC::URI& uri,
                                  const nsString& title);
     
-    virtual bool RecvLoadURIExteneral(const URI& uri);
-    
     virtual bool RecvNotifyIME(const int&, const int&);
 
     virtual bool RecvNotifyIMEChange(const nsString&, const PRUint32&, const int&, 

dom/ipc/Makefile.in

@@ -82,7 +82,6 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../../toolkit/components/places/src \
 		-I$(srcdir)/../src/geolocation \
 		-I$(topsrcdir)/chrome/src \
-		-I$(topsrcdir)/uriloader/exthandler \
 		$(NULL)
 
 CXXFLAGS += $(TK_CFLAGS)

dom/ipc/PContent.ipdl

@@ -81,8 +81,6 @@ parent:
     async VisitURI(URI uri, URI referrer, PRUint32 flags);
     async SetURITitle(URI uri, nsString title);
 
-    async LoadURIExteneral(URI uri);
-
     // PrefService messages
     sync GetPrefType(nsCString prefName) returns (PRInt32 retValue, nsresult rv);
     sync GetBoolPref(nsCString prefName) returns (PRBool retValue, nsresult rv);

uriloader/exthandler/Makefile.in

@@ -175,8 +175,6 @@ EXTRA_COMPONENTS = \
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 SRCS_IN_OBJDIR	= 1
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter qt gtk2, $(MOZ_WIDGET_TOOLKIT)))

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -42,11 +42,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef MOZ_IPC
-#include "mozilla/dom/ContentChild.h"
-#include "nsXULAppAPI.h"
-#endif
-
 #include "nsExternalHelperAppService.h"
 #include "nsCExternalHandlerService.h"
 #include "nsIURI.h"
@@ -866,13 +861,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI,
 {
   NS_ENSURE_ARG_POINTER(aURI);
 
-#ifdef MOZ_IPC
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    mozilla::dom::ContentChild::GetSingleton()->SendLoadURIExteneral(aURI);
-    return NS_OK;
-  }
-#endif
-
   nsCAutoString spec;
   aURI->GetSpec(spec);