Back out a19daae11647 (Bug 1186307) for W8 and W4 bustage on CLOSED TREE

dom/audiochannel/AudioChannelAgent.cpp

@@ -85,8 +85,6 @@ AudioChannelAgent::InitInternal(nsIDOMWindow* aWindow, int32_t aChannelType,
                                 nsIAudioChannelAgentCallback *aCallback,
                                 bool aUseWeakRef)
 {
-  MOZ_ASSERT(aWindow);
-
   // We syncd the enum of channel type between nsIAudioChannelAgent.idl and
   // AudioChannelBinding.h the same.
   MOZ_ASSERT(int(AUDIO_AGENT_CHANNEL_NORMAL) == int(AudioChannel::Normal) &&
@@ -105,6 +103,7 @@ AudioChannelAgent::InitInternal(nsIDOMWindow* aWindow, int32_t aChannelType,
     return NS_ERROR_FAILURE;
   }
 
+  if (aWindow) {
     nsCOMPtr<nsPIDOMWindow> pInnerWindow = do_QueryInterface(aWindow);
     MOZ_ASSERT(pInnerWindow->IsInnerWindow());
     mInnerWindowID = pInnerWindow->WindowID();
@@ -115,9 +114,6 @@ AudioChannelAgent::InitInternal(nsIDOMWindow* aWindow, int32_t aChannelType,
     if (mWindow) {
       mWindow = mWindow->GetOuterWindow();
     }
-
-  if (!mWindow) {
-    return NS_ERROR_FAILURE;
   }
 
   mAudioChannelType = aChannelType;
@@ -138,13 +134,6 @@ NS_IMETHODIMP AudioChannelAgent::NotifyStartedPlaying(uint32_t aNotifyPlayback,
   MOZ_ASSERT(aVolume);
   MOZ_ASSERT(aMuted);
 
-  // Window-less AudioChannelAgents are muted by default.
-  if (!mWindow) {
-    *aVolume = 0;
-    *aMuted = true;
-    return NS_OK;
-  }
-
   nsRefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
   if (mAudioChannelType == AUDIO_AGENT_CHANNEL_ERROR ||
       service == nullptr || mIsRegToService) {