Back out 68b6b149d652 (bug 683245) for xpcshell timeouts in test_content_annotation.js

dom/ipc/ContentChild.cpp

@@ -789,13 +789,5 @@ ContentChild::RecvCycleCollect()
     return true;
 }
 
-bool
-ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID)
-{
-    mAppInfo.version.Assign(version);
-    mAppInfo.buildID.Assign(buildID);
-    return true;
-}
-
 } // namespace dom
 } // namespace mozilla

dom/ipc/ContentChild.h

@@ -64,12 +64,6 @@ public:
     ContentChild();
     virtual ~ContentChild();
 
-    struct AppInfo
-    {
-        nsCString version;
-        nsCString buildID;
-    };
-
     bool Init(MessageLoop* aIOLoop,
               base::ProcessHandle aParentHandle,
               IPC::Channel* aChannel);
@@ -80,10 +74,6 @@ public:
         return sSingleton;
     }
 
-    const AppInfo& GetAppInfo() {
-        return mAppInfo;
-    }
-
     /* if you remove this, please talk to cjones or dougt */
     virtual bool RecvDummy(Shmem& foo) { return true; }
 
@@ -164,8 +154,6 @@ public:
     virtual bool RecvGarbageCollect();
     virtual bool RecvCycleCollect();
 
-    virtual bool RecvAppInfo(const nsCString& version, const nsCString& buildID);
-
 #ifdef ANDROID
     gfxIntSize GetScreenSize() { return mScreenSize; }
 #endif
@@ -193,8 +181,6 @@ private:
     gfxIntSize mScreenSize;
 #endif
 
-    AppInfo mAppInfo;
-
     static ContentChild* sSingleton;
 
     DISALLOW_EVIL_CONSTRUCTORS(ContentChild);

dom/ipc/ContentParent.cpp

@@ -71,7 +71,6 @@
 #include "nsIScriptError.h"
 #include "nsConsoleMessage.h"
 #include "nsAppDirectoryServiceDefs.h"
-#include "nsAppRunner.h"
 #include "IDBFactory.h"
 #if defined(MOZ_SYDNEYAUDIO)
 #include "AudioParent.h"
@@ -428,14 +427,6 @@ ContentParent::ContentParent()
         static_cast<nsChromeRegistryChrome*>(registrySvc.get());
     chromeRegistry->SendRegisteredChrome(this);
     mMessageManager = nsFrameMessageManager::NewProcessMessageManager(this);
-
-    if (gAppData) {
-        nsCString version(gAppData->version);
-        nsCString buildID(gAppData->buildID);
-
-        //Sending all information to content process
-        SendAppInfo(version, buildID);
-    }
 }
 
 ContentParent::~ContentParent()

dom/ipc/Makefile.in

@@ -107,7 +107,6 @@ LOCAL_INCLUDES += \
 	-I$(srcdir)/../indexedDB \
 	-I$(topsrcdir)/extensions/cookie \
 	-I$(topsrcdir)/dom/base \
-	-I$(topsrcdir)/toolkit/xre \
 	$(NULL)
 
 DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'

dom/ipc/PContent.ipdl

@@ -143,8 +143,6 @@ child:
      */
     ActivateA11y();
 
-    AppInfo(nsCString version, nsCString buildID);
-
 parent:
     PNecko();
     

toolkit/xre/nsAppRunner.cpp

@@ -60,7 +60,6 @@
 #endif // MOZ_WIDGET_QT
 
 #include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/ContentChild.h"
 
 #include "nsAppRunner.h"
 #include "nsUpdateDriver.h"
@@ -254,7 +253,6 @@ static char **gQtOnlyArgv;
 #include "BinaryPath.h"
 
 using mozilla::dom::ContentParent;
-using mozilla::dom::ContentChild;
 
 // Save literal putenv string to environment variable.
 static void
@@ -609,8 +607,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
 #ifdef MOZ_CRASHREPORTER
   NS_INTERFACE_MAP_ENTRY(nsICrashReporter)
 #endif
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData || 
-                                     XRE_GetProcessType() == GeckoProcessType_Content)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData)
 NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP_(nsrefcnt)
@@ -628,10 +625,6 @@ nsXULAppInfo::Release()
 NS_IMETHODIMP
 nsXULAppInfo::GetVendor(nsACString& aResult)
 {
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    NS_ERROR("Attempt to get unavailable information in content process.");
-    return NS_ERROR_NOT_AVAILABLE;
-  }
   aResult.Assign(gAppData->vendor);
 
   return NS_OK;
@@ -640,10 +633,6 @@ nsXULAppInfo::GetVendor(nsACString& aResult)
 NS_IMETHODIMP
 nsXULAppInfo::GetName(nsACString& aResult)
 {
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    NS_ERROR("Attempt to get unavailable information in content process.");
-    return NS_ERROR_NOT_AVAILABLE;
-  }
   aResult.Assign(gAppData->name);
 
   return NS_OK;
@@ -652,10 +641,6 @@ nsXULAppInfo::GetName(nsACString& aResult)
 NS_IMETHODIMP
 nsXULAppInfo::GetID(nsACString& aResult)
 {
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    NS_ERROR("Attempt to get unavailable information in content process.");
-    return NS_ERROR_NOT_AVAILABLE;
-  }
   aResult.Assign(gAppData->ID);
 
   return NS_OK;
@@ -664,11 +649,6 @@ nsXULAppInfo::GetID(nsACString& aResult)
 NS_IMETHODIMP
 nsXULAppInfo::GetVersion(nsACString& aResult)
 {
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    ContentChild* cc = ContentChild::GetSingleton();
-    aResult = cc->GetAppInfo().version;
-    return NS_OK;
-  }
   aResult.Assign(gAppData->version);
 
   return NS_OK;
@@ -685,11 +665,6 @@ nsXULAppInfo::GetPlatformVersion(nsACString& aResult)
 NS_IMETHODIMP
 nsXULAppInfo::GetAppBuildID(nsACString& aResult)
 {
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    ContentChild* cc = ContentChild::GetSingleton();
-    aResult = cc->GetAppInfo().buildID;
-    return NS_OK;
-  }
   aResult.Assign(gAppData->buildID);
 
   return NS_OK;