Make MediaSession available on Desktop

content/browser/media/session/browser_media_session_manager_browsertest.cc

Index: content/browser/media/session/browser_media_session_manager_browsertest.cc
diff --git a/content/browser/media/android/browser_media_session_manager_browsertest.cc b/content/browser/media/session/browser_media_session_manager_browsertest.cc
similarity index 96%
rename from content/browser/media/android/browser_media_session_manager_browsertest.cc
rename to content/browser/media/session/browser_media_session_manager_browsertest.cc
index b0892e68604ee1a4fdaf7ded4f1f036aea998a47..8730c78c6b8bdce26ce1dbb649f03e3ad6ed116a 100644
--- a/content/browser/media/android/browser_media_session_manager_browsertest.cc
+++ b/content/browser/media/session/browser_media_session_manager_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/media/android/browser_media_session_manager.h"
+#include "content/browser/media/session/browser_media_session_manager.h"
 
 #include <iostream>
 #include <sstream>
@@ -11,8 +11,8 @@
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/browser/media/android/media_web_contents_observer_android.h"
-#include "content/public/browser/web_contents.h"
+#include "content/browser/media/media_web_contents_observer.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_metadata.h"
 #include "content/public/test/browser_test_utils.h"
@@ -113,12 +113,12 @@ class BrowserMediaSessionManagerBrowserTest : public ContentBrowserTest {
  protected:
   void SetUpOnMainThread() override {
     ContentBrowserTest::SetUpOnMainThread();
-    web_contents_ = shell()->web_contents();
+    web_contents_ = static_cast<WebContentsImpl*>(shell()->web_contents());
 
     std::unique_ptr<MockBrowserMediaSessionManager> manager(
         new MockBrowserMediaSessionManager(web_contents_->GetMainFrame()));
     browser_media_session_manager_ = manager.get();
-    MediaWebContentsObserverAndroid::FromWebContents(web_contents_)
+    web_contents_->media_web_contents_observer()
         ->SetMediaSessionManagerForTest(
             web_contents_->GetMainFrame(), std::move(manager));
 
@@ -135,7 +135,7 @@ class BrowserMediaSessionManagerBrowserTest : public ContentBrowserTest {
         switches::kEnableBlinkFeatures, "MediaSession");
   }
 
-  WebContents* web_contents_;
+  WebContentsImpl* web_contents_;
   MockBrowserMediaSessionManager* browser_media_session_manager_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 };