Snapshot of all changes to get jumbo in blink and content.

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/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "content/browser/media/session/media_session_impl.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 {
 
 namespace {
 
-bool ShouldDuckFlash() {
+bool ShouldDuckFlashFoo() {
   return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
              switches::kEnableAudioFocus) ==
          switches::kEnableAudioFocusDuckFlash;
 }
 
 }  // anonymous namespace
 
 PepperPlaybackObserver::PepperPlaybackObserver(WebContents* contents)
     : contents_(contents) {}
 
@@ skipping 47 matching lines @@
   players_played_sound_map_[id] = true;
 
   if (players_map_.count(id))
     return;
 
   players_map_[id].reset(new PepperPlayerDelegate(
       render_frame_host, pp_instance));
 
   MediaSessionImpl::Get(contents_)->AddPlayer(
       players_map_[id].get(), PepperPlayerDelegate::kPlayerId,
-      ShouldDuckFlash() ? media::MediaContentType::Pepper
+      ShouldDuckFlashFoo() ? media::MediaContentType::Pepper
                         : media::MediaContentType::OneShot);
 }
 
 void PepperPlaybackObserver::PepperStopsPlayback(
     RenderFrameHost* render_frame_host, int32_t pp_instance) {
   PlayerId id(render_frame_host, pp_instance);
 
   if (!players_map_.count(id))
     return;
 
   MediaSessionImpl::Get(contents_)->RemovePlayer(
       players_map_[id].get(), PepperPlayerDelegate::kPlayerId);
 
   players_map_.erase(id);
 }
 
 }  // namespace content