Make MediaSession a runtime-enabled feature on Desktop.

content/browser/media/session/media_session_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/tuple.h"
-#include "content/browser/media/android/media_session.h"
-#include "content/browser/media/android/media_session_controller.h"
-#include "content/browser/media/android/media_web_contents_observer_android.h"
+#include "content/browser/media/media_web_contents_observer.h"
+#include "content/browser/media/session/media_session.h"
+#include "content/browser/media/session/media_session_controller.h"
 #include "content/common/media/media_player_delegate_messages.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class MediaSessionControllerTest : public RenderViewHostImplTestHarness {
  public:
   void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
     id_ = WebContentsObserver::MediaPlayerId(contents()->GetMainFrame(), 0);
-    observer_ = MediaWebContentsObserverAndroid::FromWebContents(contents());
     controller_ = CreateController();
   }
 
   void TearDown() override {
     // Destruct the controller prior to any other teardown to avoid out of order
     // destruction relative to the MediaSession instance.
     controller_.reset();
     RenderViewHostImplTestHarness::TearDown();
   }
 
  protected:
   scoped_ptr<MediaSessionController> CreateController() {
-    return scoped_ptr<MediaSessionController>(
-        new MediaSessionController(id_, observer_));
+    return scoped_ptr<MediaSessionController>(new MediaSessionController(
+        id_, contents()->media_web_contents_observer()));
   }
 
   MediaSession* media_session() { return MediaSession::Get(contents()); }
 
   IPC::TestSink& test_sink() { return main_test_rfh()->GetProcess()->sink(); }
 
   void Suspend() {
     controller_->OnSuspend(controller_->get_player_id_for_testing());
   }
 
@@ skipping 46 matching lines @@
     EXPECT_EQ(id_.second, base::get<0>(result));
     if (id_.second != base::get<0>(result))
       return false;
 
     EXPECT_EQ(expected_multiplier, base::get<1>(result));
     test_sink().ClearMessages();
     return expected_multiplier == base::get<1>(result);
   }
 
   WebContentsObserver::MediaPlayerId id_;
-  MediaWebContentsObserverAndroid* observer_;
   scoped_ptr<MediaSessionController> controller_;
 };
 
 TEST_F(MediaSessionControllerTest, NoAudioNoSession) {
   ASSERT_TRUE(controller_->Initialize(false, false, DurationJustRight()));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 }
 
 TEST_F(MediaSessionControllerTest, IsRemoteNoSession) {
@@ skipping 94 matching lines @@
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 
   // Switch to a remote player, which should release the session.
   ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight()));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 }
 
 }  // namespace content