Fixing naming issues in MediaSession

content/browser/media/session/audio_focus_delegate_android_browsertest.cc

Index: content/browser/media/session/audio_focus_delegate_android_browsertest.cc
diff --git a/content/browser/media/session/media_session_delegate_android_browsertest.cc b/content/browser/media/session/audio_focus_delegate_android_browsertest.cc
similarity index 79%
rename from content/browser/media/session/media_session_delegate_android_browsertest.cc
rename to content/browser/media/session/audio_focus_delegate_android_browsertest.cc
index e2d00a360cf2d83f2869b1d6c24ed3e58d78dd03..b69acae18f606845dd4a6a51e36379837fb3897c 100644
--- a/content/browser/media/session/media_session_delegate_android_browsertest.cc
+++ b/content/browser/media/session/audio_focus_delegate_android_browsertest.cc
@@ -10,14 +10,14 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/media/session/media_session.h"
-#include "content/browser/media/session/mock_media_session_observer.h"
+#include "content/browser/media/session/mock_media_session_player_observer.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_content_type.h"
 
 namespace content {
 
-class MediaSessionDelegateAndroidBrowserTest : public ContentBrowserTest {};
+class AudioFocusDelegateAndroidBrowserTest : public ContentBrowserTest {};
 
 // MAYBE_OnAudioFocusChangeAfterDtorCrash will hit a DCHECK before the crash, it
 // is the only way found to actually reproduce the crash so as a result, the
@@ -31,10 +31,10 @@ class MediaSessionDelegateAndroidBrowserTest : public ContentBrowserTest {};
   DISABLED_OnAudioFocusChangeAfterDtorCrash
 #endif
 
-IN_PROC_BROWSER_TEST_F(MediaSessionDelegateAndroidBrowserTest,
+IN_PROC_BROWSER_TEST_F(AudioFocusDelegateAndroidBrowserTest,
                        MAYBE_OnAudioFocusChangeAfterDtorCrash) {
-  std::unique_ptr<MockMediaSessionObserver> media_session_observer(
-      new MockMediaSessionObserver);
+  std::unique_ptr<MockMediaSessionPlayerObserver> media_session_player_observer(
+      new MockMediaSessionPlayerObserver);
 
   MediaSession* media_session = MediaSession::Get(shell()->web_contents());
   ASSERT_TRUE(media_session);
@@ -43,14 +43,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionDelegateAndroidBrowserTest,
   MediaSession* other_media_session = MediaSession::Get(other_web_contents);
   ASSERT_TRUE(other_media_session);
 
-  media_session_observer->StartNewPlayer();
-  media_session->AddPlayer(media_session_observer.get(), 0,
+  media_session_player_observer->StartNewPlayer();

[whywhat, 2016/10/18 18:11:45]

nit: you could use player_observer without losing much context but saving some
characters if you want.

[Zhiqiang Zhang (Slow), 2016/10/18 19:01:22]

Done in a local patch. Will upload after codereview is fixed.

[Zhiqiang Zhang (Slow), 2016/10/18 20:06:08]

Uploaded. Anything else, Anton?

+  media_session->AddPlayer(media_session_player_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,
+  media_session_player_observer->StartNewPlayer();
+  other_media_session->AddPlayer(media_session_player_observer.get(), 1,
                                  media::MediaContentType::Persistent);
   EXPECT_TRUE(media_session->IsActive());
   EXPECT_TRUE(other_media_session->IsActive());