Move media-related content/browser/android/ files to content/browser/media/android/.

Review URL: https://chromiumcodereview.appspot.com/23454027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223137 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 30 insertions, 33 deletions

diff --git a/content/browser/android/OWNERS b/content/browser/android/OWNERS
index f75805c..a5cf4a9 100644
--- a/content/browser/android/OWNERS
+++ b/content/browser/android/OWNERS
@@ -3,7 +3,3 @@ joth@chromium.org
 tedchoc@chromium.org
 yfriedman@chromium.org
 sievers@chromium.org
-
-# per-file rules:
-per-file *demuxer*=qinmin@chromium.org
-per-file *media*=qinmin@chromium.org
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 4e331c9..63bcee7 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -19,7 +19,6 @@
 #include "content/browser/android/download_controller_android_impl.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
-#include "content/browser/android/media_resource_getter_impl.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/android/tracing_intent_handler.h"
@@ -27,6 +26,7 @@
 #include "content/browser/android/web_contents_observer_android.h"
 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
 #include "content/browser/geolocation/location_api_adapter_android.h"
+#include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/power_save_blocker_android.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc
index ad1a018..962fee8 100644
--- a/content/browser/android/child_process_launcher_android.cc
+++ b/content/browser/android/child_process_launcher_android.cc
@@ -8,7 +8,7 @@
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/browser/android/browser_media_player_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 4a0fdc6..b8d5c64 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "content/browser/android/browser_media_player_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/common/android/surface_texture_peer.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ContentVideoView_jni.h"
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 669c896..2cf7db1 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -15,10 +15,10 @@
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
-#include "content/browser/android/browser_media_player_manager.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
diff --git a/content/browser/android/surface_texture_peer_browser_impl.cc b/content/browser/android/surface_texture_peer_browser_impl.cc
index 622c2d0..7935c9a 100644
--- a/content/browser/android/surface_texture_peer_browser_impl.cc
+++ b/content/browser/android/surface_texture_peer_browser_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 
-#include "content/browser/android/browser_media_player_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/content/browser/media/android/OWNERS b/content/browser/media/android/OWNERS
new file mode 100644
index 0000000..5abf5a1
--- /dev/null
+++ b/content/browser/media/android/OWNERS
@@ -0,0 +1 @@
+qinmin@chromium.org
diff --git a/content/browser/android/browser_demuxer_android.cc b/content/browser/media/android/browser_demuxer_android.cc
index ac143a1..446c42e 100644
--- a/content/browser/android/browser_demuxer_android.cc
+++ b/content/browser/media/android/browser_demuxer_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/browser_demuxer_android.h"
+#include "content/browser/media/android/browser_demuxer_android.h"
 
 #include "content/common/media/media_player_messages_android.h"
 
diff --git a/content/browser/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h
index 6f02a40..15b5f99 100644
--- a/content/browser/android/browser_demuxer_android.h
+++ b/content/browser/media/android/browser_demuxer_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_BROWSER_DEMUXER_ANDROID_H_
-#define CONTENT_BROWSER_ANDROID_BROWSER_DEMUXER_ANDROID_H_
+#ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
+#define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
 
 #include "base/id_map.h"
 #include "content/public/browser/render_view_host_observer.h"
@@ -52,4 +52,4 @@ class CONTENT_EXPORT BrowserDemuxerAndroid
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_BROWSER_DEMUXER_ANDROID_H_
+#endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
diff --git a/content/browser/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 94bbd291..01031c5 100644
--- a/content/browser/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/browser_media_player_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
-#include "content/browser/android/browser_demuxer_android.h"
 #include "content/browser/android/content_view_core_impl.h"
-#include "content/browser/android/media_resource_getter_impl.h"
+#include "content/browser/media/android/browser_demuxer_android.h"
+#include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/browser_context.h"
diff --git a/content/browser/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 311e80a..81eb4ca 100644
--- a/content/browser/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
-#define CONTENT_BROWSER_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
+#ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
+#define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <string>
@@ -197,4 +197,4 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
+#endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
diff --git a/content/browser/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc
index 4970310..53a5094 100644
--- a/content/browser/android/media_resource_getter_impl.cc
+++ b/content/browser/media/android/media_resource_getter_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/android/media_resource_getter_impl.h"
+#include "content/browser/media/android/media_resource_getter_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
diff --git a/content/browser/android/media_resource_getter_impl.h b/content/browser/media/android/media_resource_getter_impl.h
index 1d15244..2b6e42e 100644
--- a/content/browser/android/media_resource_getter_impl.h
+++ b/content/browser/media/android/media_resource_getter_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
-#define CONTENT_BROWSER_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
+#ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
+#define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
 
 #include <jni.h>
 #include <string>
@@ -82,4 +82,4 @@ class MediaResourceGetterImpl : public media::MediaResourceGetter {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
+#endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 0b8f4a6..f260584 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -73,7 +73,7 @@
 #if defined(OS_MACOSX)
 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
 #elif defined(OS_ANDROID)
-#include "content/browser/android/browser_media_player_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #endif
 
 using base::TimeDelta;
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index ebdfd47..b51449e 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -5,8 +5,8 @@
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/logging.h"
-#include "content/browser/android/browser_media_player_manager.h"
 #include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index bda8718..f97f544 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -236,10 +236,6 @@
     'browser/accessibility/browser_accessibility_win.h',
     'browser/android/browser_jni_registrar.cc',
     'browser/android/browser_jni_registrar.h',
-    'browser/android/browser_demuxer_android.cc',
-    'browser/android/browser_demuxer_android.h',
-    'browser/android/browser_media_player_manager.cc',
-    'browser/android/browser_media_player_manager.h',
     'browser/android/browser_startup_controller.cc',
     'browser/android/browser_startup_controller.h',
     'browser/android/child_process_launcher_android.cc',
@@ -273,8 +269,6 @@
     'browser/android/interstitial_page_delegate_android.h',
     'browser/android/load_url_params.cc',
     'browser/android/load_url_params.h',
-    'browser/android/media_resource_getter_impl.cc',
-    'browser/android/media_resource_getter_impl.h',
     'browser/android/overscroll_glow.h',
     'browser/android/overscroll_glow.cc',
     'browser/android/surface_texture_peer_browser_impl.cc',
@@ -700,6 +694,12 @@
     'browser/loader/upload_data_stream_builder.h',
     'browser/mach_broker_mac.h',
     'browser/mach_broker_mac.mm',
+    'browser/media/android/browser_demuxer_android.cc',
+    'browser/media/android/browser_demuxer_android.h',
+    'browser/media/android/browser_media_player_manager.cc',
+    'browser/media/android/browser_media_player_manager.h',
+    'browser/media/android/media_resource_getter_impl.cc',
+    'browser/media/android/media_resource_getter_impl.h',
     'browser/media/media_internals.cc',
     'browser/media/media_internals.h',
     'browser/media/media_internals_handler.cc',