Fixing naming issues in MediaSession

content/browser/media/session/media_session_controller.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_
 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "content/browser/media/session/media_session_observer.h"
+#include "content/browser/media/session/media_session_player_observer.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace media {
 enum class MediaContentType;
 }  // namespace media
 
 namespace content {
 
 class MediaSession;
 class MediaWebContentsObserver;
 
 // Helper class for controlling a single player's MediaSession instance.  Sends
 // browser side MediaSession commands back to a player hosted in the renderer
 // process.
-class CONTENT_EXPORT MediaSessionController :
-    NON_EXPORTED_BASE(public MediaSessionObserver) {
+class CONTENT_EXPORT MediaSessionController
+    : NON_EXPORTED_BASE(public MediaSessionPlayerObserver) {
  public:
   MediaSessionController(const WebContentsObserver::MediaPlayerId& id,
                          MediaWebContentsObserver* media_web_contents_observer);
   ~MediaSessionController() override;
 
   // Clients must call this after construction and destroy the controller if it
   // returns false.  May be called more than once; does nothing if none of the
   // input parameters have changed since the last call.
   //
   // Note: Once a session has been initialized with |has_audio| as true, all
@@ skipping 27 matching lines @@
 
   int player_id_ = 0;
   bool has_session_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSessionController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_CONTROLLER_H_