Fixing naming issues in MediaSession

content/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
@@ skipping 562 matching lines @@
     "../browser/loader/resource_dispatcher_host_browsertest.cc",
     "../browser/manifest/manifest_browsertest.cc",
     "../browser/media/encrypted_media_browsertest.cc",
     "../browser/media/media_browsertest.cc",
     "../browser/media/media_browsertest.h",
     "../browser/media/media_canplaytype_browsertest.cc",
     "../browser/media/media_color_browsertest.cc",
     "../browser/media/media_redirect_browsertest.cc",
     "../browser/media/media_source_browsertest.cc",
     "../browser/media/midi_browsertest.cc",
+    "../browser/media/session/audio_focus_delegate_default_browsertest.cc",
     "../browser/media/session/media_session_browsertest.cc",
-    "../browser/media/session/media_session_delegate_default_browsertest.cc",
     "../browser/media/session/media_session_visibility_browsertest.cc",
-    "../browser/media/session/mock_media_session_observer.cc",
-    "../browser/media/session/mock_media_session_observer.h",
+    "../browser/media/session/mock_media_session_player_observer.cc",
+    "../browser/media/session/mock_media_session_player_observer.h",
     "../browser/memory/memory_coordinator_browsertest.cc",
     "../browser/memory/memory_pressure_controller_impl_browsertest.cc",
     "../browser/message_port_provider_browsertest.cc",
     "../browser/mojo_sandbox_browsertest.cc",
     "../browser/net_info_browsertest.cc",
     "../browser/presentation/presentation_browsertest.cc",
     "../browser/renderer_host/input/composited_scrolling_browsertest.cc",
     "../browser/renderer_host/input/main_thread_event_queue_browsertest.cc",
     "../browser/renderer_host/input/non_blocking_event_browsertest.cc",
     "../browser/renderer_host/input/touch_action_browsertest.cc",
@@ skipping 180 matching lines @@
     libs = [ "oleacc.lib" ]
   }
 
   if (is_linux) {
     sources += [ "../zygote/zygote_browsertest.cc" ]
   }
 
   if (is_android) {
     sources += [
       "../browser/accessibility/android_granularity_movement_browsertest.cc",
-      "../browser/media/session/media_session_delegate_android_browsertest.cc",
+      "../browser/media/session/audio_focus_delegate_android_browsertest.cc",
       "../shell/android/browsertests_apk/content_browser_tests_jni_onload.cc",
     ]
     sources -= [
       "../browser/battery_status/battery_monitor_impl_browsertest.cc",
-      "../browser/media/session/media_session_delegate_default_browsertest.cc",
+      "../browser/media/session/audio_focus_delegate_default_browsertest.cc",
     ]
     deps += [
       ":content_browsertests_java",
       "//content/shell:content_shell_lib",
       "//content/shell/android:content_shell_assets",
       "//content/shell/android:content_shell_jni_headers",
       "//testing/android/native_test:native_test_support",
     ]
     deps -= [ "//device/battery" ]
     android_manifest =
@@ skipping 883 matching lines @@
   if (is_android) {
     deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
 group("fuzzers") {
   deps = [
     "//content/test/fuzzer",
   ]
 }