Backed out changeset 6b886fbb3e48 (bug 1148032) for mochitest-chrome …

…orange on b2g emulators

dom/broadcastchannel/BroadcastChannel.cpp

@@ -126,13 +126,11 @@ class InitializeRunnable final : public WorkerMainThreadRunnable
 {
 public:
   InitializeRunnable(WorkerPrivate* aWorkerPrivate, nsAString& aOrigin,
-                     PrincipalInfo& aPrincipalInfo, bool& aPrivateBrowsing,
-                     ErrorResult& aRv)
+                     PrincipalInfo& aPrincipalInfo, ErrorResult& aRv)
     : WorkerMainThreadRunnable(aWorkerPrivate)
     , mWorkerPrivate(GetCurrentThreadWorkerPrivate())
     , mOrigin(aOrigin)
     , mPrincipalInfo(aPrincipalInfo)
-    , mPrivateBrowsing(aPrivateBrowsing)
     , mRv(aRv)
   {
     MOZ_ASSERT(mWorkerPrivate);
@@ -182,10 +180,8 @@ class InitializeRunnable final : public WorkerMainThreadRunnable
     }
 
     nsIDocument* doc = window->GetExtantDoc();
+    // No bfcache when BroadcastChannel is used.
     if (doc) {
-      mPrivateBrowsing = nsContentUtils::IsInPrivateBrowsing(doc);
-
-      // No bfcache when BroadcastChannel is used.
       doc->DisallowBFCaching();
     }
 
@@ -196,7 +192,6 @@ class InitializeRunnable final : public WorkerMainThreadRunnable
   WorkerPrivate* mWorkerPrivate;
   nsAString& mOrigin;
   PrincipalInfo& mPrincipalInfo;
-  bool& mPrivateBrowsing;
   ErrorResult& mRv;
 };
 
@@ -401,14 +396,12 @@ BroadcastChannel::IsEnabled(JSContext* aCx, JSObject* aGlobal)
 BroadcastChannel::BroadcastChannel(nsPIDOMWindow* aWindow,
                                    const PrincipalInfo& aPrincipalInfo,
                                    const nsAString& aOrigin,
-                                   const nsAString& aChannel,
-                                   bool aPrivateBrowsing)
+                                   const nsAString& aChannel)
   : DOMEventTargetHelper(aWindow)
   , mWorkerFeature(nullptr)
   , mPrincipalInfo(new PrincipalInfo(aPrincipalInfo))
   , mOrigin(aOrigin)
   , mChannel(aChannel)
-  , mPrivateBrowsing(aPrivateBrowsing)
   , mIsKeptAlive(false)
   , mInnerID(0)
   , mState(StateActive)
@@ -438,7 +431,6 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
 
   nsAutoString origin;
   PrincipalInfo principalInfo;
-  bool privateBrowsing = false;
   WorkerPrivate* workerPrivate = nullptr;
 
   if (NS_IsMainThread()) {
@@ -477,10 +469,8 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
     }
 
     nsIDocument* doc = window->GetExtantDoc();
+    // No bfcache when BroadcastChannel is used.
     if (doc) {
-      privateBrowsing = nsContentUtils::IsInPrivateBrowsing(doc);
-
-      // No bfcache when BroadcastChannel is used.
       doc->DisallowBFCaching();
     }
   } else {
@@ -489,8 +479,7 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
     MOZ_ASSERT(workerPrivate);
 
     nsRefPtr<InitializeRunnable> runnable =
-      new InitializeRunnable(workerPrivate, origin, principalInfo,
-                             privateBrowsing, aRv);
+      new InitializeRunnable(workerPrivate, origin, principalInfo, aRv);
     runnable->Dispatch(cx);
   }
 
@@ -499,8 +488,7 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
   }
 
   nsRefPtr<BroadcastChannel> bc =
-    new BroadcastChannel(window, principalInfo, origin, aChannel,
-                         privateBrowsing);
+    new BroadcastChannel(window, principalInfo, origin, aChannel);
 
   // Register this component to PBackground.
   PBackgroundChild* actor = BackgroundChild::GetForCurrentThread();
@@ -626,8 +614,7 @@ BroadcastChannel::ActorCreated(PBackgroundChild* aActor)
   }
 
   PBroadcastChannelChild* actor =
-    aActor->SendPBroadcastChannelConstructor(*mPrincipalInfo, mOrigin, mChannel,
-                                             mPrivateBrowsing);
+    aActor->SendPBroadcastChannelConstructor(*mPrincipalInfo, mOrigin, mChannel);
 
   mActor = static_cast<BroadcastChannelChild*>(actor);
   MOZ_ASSERT(mActor);

dom/broadcastchannel/BroadcastChannel.h

@@ -92,8 +92,7 @@ class BroadcastChannel final
   BroadcastChannel(nsPIDOMWindow* aWindow,
                    const PrincipalInfo& aPrincipalInfo,
                    const nsAString& aOrigin,
-                   const nsAString& aChannel,
-                   bool aPrivateBrowsing);
+                   const nsAString& aChannel);
 
   ~BroadcastChannel();
 
@@ -113,7 +112,6 @@ class BroadcastChannel final
 
   nsString mOrigin;
   nsString mChannel;
-  bool mPrivateBrowsing;
 
   bool mIsKeptAlive;
 

dom/broadcastchannel/BroadcastChannelChild.cpp

@@ -25,8 +25,10 @@ namespace dom {
 
 using namespace workers;
 
-BroadcastChannelChild::BroadcastChannelChild(const nsAString& aOrigin)
+BroadcastChannelChild::BroadcastChannelChild(const nsAString& aOrigin,
+                                             const nsAString& aChannel)
   : mOrigin(aOrigin)
+  , mChannel(aChannel)
   , mActorDestroyed(false)
 {
 }

dom/broadcastchannel/BroadcastChannelChild.h

@@ -37,7 +37,9 @@ class BroadcastChannelChild final : public PBroadcastChannelChild
   }
 
 private:
-  explicit BroadcastChannelChild(const nsAString& aOrigin);
+  BroadcastChannelChild(const nsAString& aOrigin,
+                        const nsAString& aChannel);
+
   ~BroadcastChannelChild();
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
@@ -47,6 +49,7 @@ class BroadcastChannelChild final : public PBroadcastChannelChild
   BroadcastChannel* mBC;
 
   nsString mOrigin;
+  nsString mChannel;
 
   bool mActorDestroyed;
 };

dom/broadcastchannel/BroadcastChannelParent.cpp

@@ -18,12 +18,10 @@ namespace dom {
 
 BroadcastChannelParent::BroadcastChannelParent(
                                             const nsAString& aOrigin,
-                                            const nsAString& aChannel,
-                                            bool aPrivateBrowsing)
+                                            const nsAString& aChannel)
   : mService(BroadcastChannelService::GetOrCreate())
   , mOrigin(aOrigin)
   , mChannel(aChannel)
-  , mPrivateBrowsing(aPrivateBrowsing)
 {
   AssertIsOnBackgroundThread();
   mService->RegisterActor(this);
@@ -43,7 +41,7 @@ BroadcastChannelParent::RecvPostMessage(const ClonedMessageData& aData)
     return false;
   }
 
-  mService->PostMessage(this, aData, mOrigin, mChannel, mPrivateBrowsing);
+  mService->PostMessage(this, aData, mOrigin, mChannel);
   return true;
 }
 
@@ -79,14 +77,11 @@ BroadcastChannelParent::ActorDestroy(ActorDestroyReason aWhy)
 void
 BroadcastChannelParent::CheckAndDeliver(const ClonedMessageData& aData,
                                         const nsString& aOrigin,
-                                        const nsString& aChannel,
-                                        bool aPrivateBrowsing)
+                                        const nsString& aChannel)
 {
   AssertIsOnBackgroundThread();
 
-  if (aOrigin == mOrigin &&
-      aChannel == mChannel &&
-      aPrivateBrowsing == mPrivateBrowsing) {
+  if (aOrigin == mOrigin && aChannel == mChannel) {
     // We need to duplicate data only if we have blobs or if the manager of
     // them is different than the manager of this parent actor.
     if (aData.blobsParent().IsEmpty() ||

dom/broadcastchannel/BroadcastChannelParent.h

@@ -24,13 +24,11 @@ class BroadcastChannelParent final : public PBroadcastChannelParent
 public:
   void CheckAndDeliver(const ClonedMessageData& aData,
                        const nsString& aOrigin,
-                       const nsString& aChannel,
-                       bool aPrivateBrowsing);
+                       const nsString& aChannel);
 
 private:
   BroadcastChannelParent(const nsAString& aOrigin,
-                         const nsAString& aChannel,
-                         bool aPrivateBrowsing);
+                         const nsAString& aChannel);
   ~BroadcastChannelParent();
 
   virtual bool
@@ -43,7 +41,6 @@ class BroadcastChannelParent final : public PBroadcastChannelParent
   nsRefPtr<BroadcastChannelService> mService;
   nsString mOrigin;
   nsString mChannel;
-  bool mPrivateBrowsing;
 };
 
 } // dom namespace

dom/broadcastchannel/BroadcastChannelService.cpp

@@ -83,13 +83,11 @@ struct MOZ_STACK_CLASS PostMessageData final
   PostMessageData(BroadcastChannelParent* aParent,
                   const ClonedMessageData& aData,
                   const nsAString& aOrigin,
-                  const nsAString& aChannel,
-                  bool aPrivateBrowsing)
+                  const nsAString& aChannel)
     : mParent(aParent)
     , mData(aData)
     , mOrigin(aOrigin)
     , mChannel(aChannel)
-    , mPrivateBrowsing(aPrivateBrowsing)
   {
     MOZ_ASSERT(aParent);
     MOZ_COUNT_CTOR(PostMessageData);
@@ -118,7 +116,6 @@ struct MOZ_STACK_CLASS PostMessageData final
   nsTArray<nsRefPtr<FileImpl>> mFiles;
   const nsString mOrigin;
   const nsString mChannel;
-  bool mPrivateBrowsing;
 };
 
 PLDHashOperator
@@ -131,8 +128,7 @@ PostMessageEnumerator(nsPtrHashKey<BroadcastChannelParent>* aKey, void* aPtr)
   MOZ_ASSERT(parent);
 
   if (parent != data->mParent) {
-    parent->CheckAndDeliver(data->mData, data->mOrigin, data->mChannel,
-                            data->mPrivateBrowsing);
+    parent->CheckAndDeliver(data->mData, data->mOrigin, data->mChannel);
   }
 
   return PL_DHASH_NEXT;
@@ -144,14 +140,13 @@ void
 BroadcastChannelService::PostMessage(BroadcastChannelParent* aParent,
                                      const ClonedMessageData& aData,
                                      const nsAString& aOrigin,
-                                     const nsAString& aChannel,
-                                     bool aPrivateBrowsing)
+                                     const nsAString& aChannel)
 {
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(aParent);
   MOZ_ASSERT(mAgents.Contains(aParent));
 
-  PostMessageData data(aParent, aData, aOrigin, aChannel, aPrivateBrowsing);
+  PostMessageData data(aParent, aData, aOrigin, aChannel);
   mAgents.EnumerateEntries(PostMessageEnumerator, &data);
 }
 

dom/broadcastchannel/BroadcastChannelService.h

@@ -32,8 +32,7 @@ class BroadcastChannelService final
   void PostMessage(BroadcastChannelParent* aParent,
                    const ClonedMessageData& aData,
                    const nsAString& aOrigin,
-                   const nsAString& aChannel,
-                   bool aPrivateBrowsing);
+                   const nsAString& aChannel);
 
 private:
   BroadcastChannelService();

dom/broadcastchannel/moz.build

@@ -24,7 +24,6 @@ LOCAL_INCLUDES += [
 ]
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')