Split MediaContentType and AudioFocusType

content/browser/media/session/media_session_delegate_default_browsertest.cc

Index: content/browser/media/session/media_session_delegate_default_browsertest.cc
diff --git a/content/browser/media/session/media_session_delegate_default_browsertest.cc b/content/browser/media/session/media_session_delegate_default_browsertest.cc
index 5d000ea9cbb94d28e52566a971c01e116c6ed8ad..921c084636b984aab613466a9aaec41d73ef5e80 100644
--- a/content/browser/media/session/media_session_delegate_default_browsertest.cc
+++ b/content/browser/media/session/media_session_delegate_default_browsertest.cc
@@ -7,6 +7,7 @@
 #include "content/browser/media/session/mock_media_session_observer.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/shell/browser/shell.h"
+#include "media/base/media_content_type.h"
 #include "media/base/media_switches.h"
 
 namespace content {
@@ -28,14 +29,14 @@ class MediaSessionDelegateDefaultBrowserTest : public ContentBrowserTest {
     ASSERT_TRUE(other_media_session);
 
     media_session_observer->StartNewPlayer();
-    media_session->AddPlayer(
-        media_session_observer.get(), 0, MediaSession::Type::Content);
+    media_session->AddPlayer(media_session_observer.get(), 0,
+                             media::MediaContentType::Persistent);
     EXPECT_TRUE(media_session->IsActive());
     EXPECT_FALSE(other_media_session->IsActive());
 
     media_session_observer->StartNewPlayer();
-    other_media_session->AddPlayer(
-        media_session_observer.get(), 1, MediaSession::Type::Content);
+    other_media_session->AddPlayer(media_session_observer.get(), 1,
+                                   media::MediaContentType::Persistent);
     EXPECT_FALSE(media_session->IsActive());
     EXPECT_TRUE(other_media_session->IsActive());