Fixing naming issues in MediaSession

content/browser/media/session/audio_focus_manager_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 "content/browser/media/session/audio_focus_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/media/session/media_session.h"
-#include "content/browser/media/session/media_session_observer.h"
+#include "content/browser/media/session/media_session_player_observer.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/media_content_type.h"
 #include "media/base/media_switches.h"
 
 namespace content {
 
 namespace {
 
-class MockMediaSessionObserver : public MediaSessionObserver {
+class MockMediaSessionPlayerObserver : public MediaSessionPlayerObserver {
  public:
   void OnSuspend(int player_id) override {}
   void OnResume(int player_id) override {}
   void OnSetVolumeMultiplier(
       int player_id, double volume_multiplier) override {}
 };
 
 }  // anonymous namespace
 
 using AudioFocusType = AudioFocusManager::AudioFocusType;
 using SuspendType = MediaSession::SuspendType;
 
 class AudioFocusManagerTest : public testing::Test {
  public:
   AudioFocusManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_) {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableDefaultMediaSession);
     rph_factory_.reset(new MockRenderProcessHostFactory());
     SiteInstanceImpl::set_render_process_host_factory(rph_factory_.get());
     browser_context_.reset(new TestBrowserContext());
-    pepper_observer_.reset(new MockMediaSessionObserver());
+    pepper_observer_.reset(new MockMediaSessionPlayerObserver());
   }
 
   void TearDown() override {
     browser_context_.reset();
     SiteInstanceImpl::set_render_process_host_factory(nullptr);
     rph_factory_.reset();
   }
 
   MediaSession* GetAudioFocusedSession() const {
     const auto& audio_focus_stack =
@@ skipping 35 matching lines @@
 
   void AbandonAudioFocus(MediaSession* session) {
     session->AbandonSystemAudioFocusIfNeeded();
   }
 
   WebContents* CreateWebContents() {
     return TestWebContents::Create(browser_context_.get(),
         SiteInstance::SiteInstance::Create(browser_context_.get()));
   }
 
-  std::unique_ptr<MediaSessionObserver> pepper_observer_;
+  std::unique_ptr<MediaSessionPlayerObserver> pepper_observer_;
 
  private:
   base::MessageLoopForUI message_loop_;
   TestBrowserThread ui_thread_;
 
   std::unique_ptr<MockRenderProcessHostFactory> rph_factory_;
   std::unique_ptr<TestBrowserContext> browser_context_;
 };
 
 TEST_F(AudioFocusManagerTest, InstanceAvailableAndSame) {
@@ skipping 315 matching lines @@
   ASSERT_EQ(media_session_3, GetAudioFocusedSession());
   ASSERT_TRUE(media_session_2->IsReallySuspended());
   ASSERT_TRUE(media_session_1->IsActive());
   ASSERT_TRUE(IsSessionDucking(media_session_1));
 
   AbandonAudioFocus(media_session_3);
   ASSERT_EQ(media_session_1, GetAudioFocusedSession());
 }
 
 }  // namespace content