Move media-related IPC message definitions from content/common/ to content/common/media.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/7170007

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

23 files changed, 35 insertions, 26 deletions

diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 4a5c57a..8298103 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -9,7 +9,7 @@
 #include "base/shared_memory.h"
 #include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
 
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 5ee647c..b3ac058 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -9,7 +9,7 @@
 #include "base/shared_memory.h"
 #include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
 
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index df2d5b0..358c2fb 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/sync_socket.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_output_stream.h"
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index 01cd3e0..c69b171 100644
--- a/content/browser/renderer_host/media/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -6,7 +6,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
-#include "content/common/video_capture_messages.h"
+#include "content/common/media/video_capture_messages.h"
 
 VideoCaptureHost::VideoCaptureHost() {}
 
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index a7a56ab..aaf0e8e 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -14,7 +14,7 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/media/video_capture_host.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
-#include "content/common/video_capture_messages.h"
+#include "content/common/media/video_capture_messages.h"
 #include "media/video/capture/video_capture_types.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 2d3c07d..1df560f 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -10,7 +10,6 @@
 // libraries.
 #if !defined(NACL_WIN64)
 #include "content/common/appcache_messages.h"
-#include "content/common/audio_messages.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/database_messages.h"
 #include "content/common/desktop_notification_messages.h"
@@ -23,6 +22,8 @@
 #include "content/common/geolocation_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/indexed_db_messages.h"
+#include "content/common/media/audio_messages.h"
+#include "content/common/media/video_capture_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/p2p_messages.h"
 #include "content/common/pepper_file_messages.h"
@@ -32,7 +33,6 @@
 #include "content/common/speech_input_messages.h"
 #include "content/common/socket_stream_messages.h"
 #include "content/common/utility_messages.h"
-#include "content/common/video_capture_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/webblob_messages.h"
 #include "content/common/worker_messages.h"
diff --git a/content/common/media/OWNERS b/content/common/media/OWNERS
new file mode 100644
index 0000000..d37c12f
--- /dev/null
+++ b/content/common/media/OWNERS
@@ -0,0 +1,9 @@
+acolwell@chromium.org
+annacc@chromium.org
+ddorwin@chormium.org
+fischman@chromium.org
+imasaki@chromium.org
+scherkus@chromium.org
+sjl@chromium.org
+vrk@chromium.org
+wjia@chromium.org
diff --git a/content/common/audio_messages.h b/content/common/media/audio_messages.h
index a1e7e267..41da486 100644
--- a/content/common/audio_messages.h
+++ b/content/common/media/audio_messages.h
@@ -7,7 +7,7 @@
 
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
-#include "content/common/audio_stream_state.h"
+#include "content/common/media/audio_stream_state.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_parameters.h"
diff --git a/content/common/audio_stream_state.h b/content/common/media/audio_stream_state.h
index 9557772..fd42db5 100644
--- a/content/common/audio_stream_state.h
+++ b/content/common/media/audio_stream_state.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_COMMON_AUDIO_STREAM_STATE_H_
-#define CONTENT_COMMON_AUDIO_STREAM_STATE_H_
+#ifndef CONTENT_COMMON_MEDIA_AUDIO_STREAM_STATE_H_
+#define CONTENT_COMMON_MEDIA_AUDIO_STREAM_STATE_H_
 #pragma once
 
 // Current status of the audio output stream in the browser process. Browser
@@ -15,4 +15,4 @@ enum AudioStreamState {
   kAudioStreamError
 };
 
-#endif  // CONTENT_COMMON_AUDIO_STREAM_STATE_H_
+#endif  // CONTENT_COMMON_MEDIA_AUDIO_STREAM_STATE_H_
diff --git a/content/common/video_capture_messages.h b/content/common/media/video_capture_messages.h
index 7b5b8d9..7b5b8d9 100644
--- a/content/common/video_capture_messages.h
+++ b/content/common/media/video_capture_messages.h
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 24061c3..54541be 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -35,8 +35,6 @@
         'common/appcache/appcache_dispatcher.cc',
         'common/appcache/appcache_dispatcher.h',
         'common/appcache_messages.h',
-        'common/audio_messages.h',
-        'common/audio_stream_state.h',
         'common/bindings_policy.h',
         'common/child_process.cc',
         'common/child_process.h',
@@ -144,6 +142,9 @@
         'common/json_value_serializer.cc',
         'common/json_value_serializer.h',
         'common/main_function_params.h',
+        'common/media/audio_messages.h',
+        'common/media/audio_stream_state.h',
+        'common/media/video_capture_messages.h',
         'common/message_router.cc',
         'common/message_router.h',
         'common/mime_registry_messages.h',
@@ -229,7 +230,6 @@
         'common/url_fetcher.cc',
         'common/url_fetcher.h',
         'common/utility_messages.h',
-        'common/video_capture_messages.h',
         'common/view_messages.h',
         'common/view_types.cc',
         'common/view_types.h',
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index 39f9460..619c279 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -6,8 +6,8 @@
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "content/common/audio_messages.h"
 #include "content/common/child_process.h"
+#include "content/common/media/audio_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 #include "media/audio/audio_util.h"
diff --git a/content/renderer/media/audio_input_device.cc b/content/renderer/media/audio_input_device.cc
index 4fe3364..5a821b0 100644
--- a/content/renderer/media/audio_input_device.cc
+++ b/content/renderer/media/audio_input_device.cc
@@ -6,8 +6,8 @@
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "content/common/audio_messages.h"
 #include "content/common/child_process.h"
+#include "content/common/media/audio_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 #include "media/audio/audio_util.h"
diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc
index 9f99e86..0d556ef 100644
--- a/content/renderer/media/audio_input_message_filter.cc
+++ b/content/renderer/media/audio_input_message_filter.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
 AudioInputMessageFilter::AudioInputMessageFilter(int32 route_id)
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index a906a9c..d286b47 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
 AudioMessageFilter::AudioMessageFilter(int32 route_id)
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index e4d4db0..415e981 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -15,7 +15,7 @@
 #include "base/id_map.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
-#include "content/common/audio_stream_state.h"
+#include "content/common/media/audio_stream_state.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "media/audio/audio_buffers_state.h"
 
diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc
index 37da0a6..595e4ff 100644
--- a/content/renderer/media/audio_message_filter_unittest.cc
+++ b/content/renderer/media/audio_message_filter_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc
index e4e96b5..3185ffa 100644
--- a/content/renderer/media/audio_renderer_impl.cc
+++ b/content/renderer/media/audio_renderer_impl.cc
@@ -6,7 +6,7 @@
 
 #include <math.h>
 
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "media/base/filter_host.h"
diff --git a/content/renderer/media/audio_renderer_impl_unittest.cc b/content/renderer/media/audio_renderer_impl_unittest.cc
index cdbb62a..a183aac 100644
--- a/content/renderer/media/audio_renderer_impl_unittest.cc
+++ b/content/renderer/media/audio_renderer_impl_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/process_util.h"
-#include "content/common/audio_messages.h"
+#include "content/common/media/audio_messages.h"
 #include "content/renderer/media/audio_renderer_impl.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_callback.h"
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 8e2d324..a6456c5 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -6,7 +6,7 @@
 
 #include "base/stl_util-inl.h"
 #include "content/common/child_process.h"
-#include "content/common/video_capture_messages.h"
+#include "content/common/media/video_capture_messages.h"
 
 VideoCaptureImpl::DIBBuffer::DIBBuffer(
     base::SharedMemory* d, media::VideoCapture::VideoFrameBuffer* ptr)
diff --git a/content/renderer/media/video_capture_message_filter.cc b/content/renderer/media/video_capture_message_filter.cc
index 9d8d50b..1bbc6d8 100644
--- a/content/renderer/media/video_capture_message_filter.cc
+++ b/content/renderer/media/video_capture_message_filter.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/media/video_capture_message_filter.h"
 
-#include "content/common/video_capture_messages.h"
+#include "content/common/media/video_capture_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 
diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc
index 53717bc..46c9ed0 100644
--- a/content/renderer/media/video_capture_message_filter_unittest.cc
+++ b/content/renderer/media/video_capture_message_filter_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
-#include "content/common/video_capture_messages.h"
+#include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index fe91c6d..4adc7b0 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -16,11 +16,11 @@
 #include "base/sync_socket.h"
 #include "base/task.h"
 #include "base/time.h"
-#include "content/common/audio_messages.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/content_switches.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/media/audio_messages.h"
 #include "content/common/pepper_file_messages.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/pepper_messages.h"