Split MediaContentType and AudioFocusType

content/browser/media/session/pepper_playback_observer.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/pepper_playback_observer.h"
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "content/browser/media/session/media_session.h"
 #include "content/browser/media/session/pepper_player_delegate.h"
 #include "content/common/frame_messages.h"
 #include "ipc/ipc_message_macros.h"
+#include "media/base/media_content_type.h"
 #include "media/base/media_switches.h"
 
 namespace content {
 
 PepperPlaybackObserver::PepperPlaybackObserver(WebContentsImpl *contents)
     : contents_(contents) {}
 
 PepperPlaybackObserver::~PepperPlaybackObserver() {
   // At this point WebContents is being destructed, so it's safe to
   // call this. MediaSession may decide to send further IPC messages
@@ skipping 23 matching lines @@
   players_played_sound_map_[pp_instance] = true;
 
   if (!base::FeatureList::IsEnabled(media::kFlashJoinsMediaSession))
     return;
 
   if (players_map_.count(pp_instance))
     return;
 
   players_map_[pp_instance].reset(new PepperPlayerDelegate(
       contents_, pp_instance));
-  MediaSession::Get(contents_)->AddPlayer(
-      players_map_[pp_instance].get(),
-      PepperPlayerDelegate::kPlayerId,
-      MediaSession::Type::Content);
+  MediaSession::Get(contents_)->AddPlayer(players_map_[pp_instance].get(),
+                                          PepperPlayerDelegate::kPlayerId,
+                                          media::MediaContentType::Unpausable);
 }
 
 void PepperPlaybackObserver::PepperStopsPlayback(int32_t pp_instance) {
   if (!players_map_.count(pp_instance))
     return;
 
   MediaSession::Get(contents_)->RemovePlayer(
       players_map_[pp_instance].get(), PepperPlayerDelegate::kPlayerId);
 
   players_map_.erase(pp_instance);
 }
 
 }  // namespace content