15 files changed, 35 insertions, 35 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9eae666..59373d98 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1993,7 +1993,7 @@
         '../content/gpu/gpu_info_collector_unittest.cc',
         '../content/gpu/gpu_info_collector_unittest_win.cc',
         '../content/renderer/active_notification_tracker_unittest.cc',
-        '../content/renderer/audio_message_filter_unittest.cc',
+        '../content/renderer/media/audio_message_filter_unittest.cc',
         '../content/renderer/media/audio_renderer_impl_unittest.cc',
         '../content/renderer/media/video_capture_impl_unittest.cc',
         '../content/renderer/paint_aggregator_unittest.cc',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 4bded54c..15aba8b 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -29,14 +29,6 @@
       'sources': [
         'renderer/active_notification_tracker.cc',
         'renderer/active_notification_tracker.h',
-        'renderer/audio_device.cc',
-        'renderer/audio_device.h',
-        'renderer/audio_input_device.cc',
-        'renderer/audio_input_device.h',
-        'renderer/audio_input_message_filter.cc',
-        'renderer/audio_input_message_filter.h',
-        'renderer/audio_message_filter.cc',
-        'renderer/audio_message_filter.h',
         'renderer/content_renderer_client.cc',
         'renderer/content_renderer_client.h',
         'renderer/device_orientation_dispatcher.cc',
@@ -65,6 +57,14 @@
         'renderer/indexed_db_dispatcher.h',
         'renderer/load_progress_tracker.cc',
         'renderer/load_progress_tracker.h',
+        'renderer/media/audio_device.cc',
+        'renderer/media/audio_device.h',
+        'renderer/media/audio_input_device.cc',
+        'renderer/media/audio_input_device.h',
+        'renderer/media/audio_input_message_filter.cc',
+        'renderer/media/audio_input_message_filter.h',
+        'renderer/media/audio_message_filter.cc',
+        'renderer/media/audio_message_filter.h',
         'renderer/media/audio_renderer_impl.cc',
         'renderer/media/audio_renderer_impl.h',
         'renderer/media/video_capture_impl.cc',
diff --git a/content/renderer/audio_device.cc b/content/renderer/media/audio_device.cc
index 5baa55c..39f9460 100644
--- a/content/renderer/audio_device.cc
+++ b/content/renderer/media/audio_device.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/renderer/audio_device.h"
+#include "content/renderer/media/audio_device.h"
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
diff --git a/content/renderer/audio_device.h b/content/renderer/media/audio_device.h
index 54b8fe1..88c2a0c 100644
--- a/content/renderer/audio_device.h
+++ b/content/renderer/media/audio_device.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_RENDERER_AUDIO_DEVICE_H_
-#define CONTENT_RENDERER_AUDIO_DEVICE_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_H_
 #pragma once
 
 #include <vector>
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/threading/simple_thread.h"
-#include "content/renderer/audio_message_filter.h"
+#include "content/renderer/media/audio_message_filter.h"
 
 struct AudioParameters;
 
@@ -118,4 +118,4 @@ class AudioDevice : public AudioMessageFilter::Delegate,
   DISALLOW_COPY_AND_ASSIGN(AudioDevice);
 };
 
-#endif  // CONTENT_RENDERER_AUDIO_DEVICE_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_DEVICE_H_
diff --git a/content/renderer/audio_input_device.cc b/content/renderer/media/audio_input_device.cc
index 2b565e9..4fe3364 100644
--- a/content/renderer/audio_input_device.cc
+++ b/content/renderer/media/audio_input_device.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/renderer/audio_input_device.h"
+#include "content/renderer/media/audio_input_device.h"
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
diff --git a/content/renderer/audio_input_device.h b/content/renderer/media/audio_input_device.h
index 432999f..7c0c37c 100644
--- a/content/renderer/audio_input_device.h
+++ b/content/renderer/media/audio_input_device.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_RENDERER_AUDIO_INPUT_DEVICE_H_
-#define CONTENT_RENDERER_AUDIO_INPUT_DEVICE_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_INPUT_DEVICE_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_INPUT_DEVICE_H_
 #pragma once
 
 #include <vector>
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/threading/simple_thread.h"
-#include "content/renderer/audio_input_message_filter.h"
+#include "content/renderer/media/audio_input_message_filter.h"
 
 struct AudioParameters;
 
@@ -119,4 +119,4 @@ class AudioInputDevice : public AudioInputMessageFilter::Delegate,
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputDevice);
 };
 
-#endif  // CONTENT_RENDERER_AUDIO_INPUT_DEVICE_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_INPUT_DEVICE_H_
diff --git a/content/renderer/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc
index 35a051d..9f99e86 100644
--- a/content/renderer/audio_input_message_filter.cc
+++ b/content/renderer/media/audio_input_message_filter.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/renderer/audio_input_message_filter.h"
+#include "content/renderer/media/audio_input_message_filter.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
diff --git a/content/renderer/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h
index f28ed6d..3721e83 100644
--- a/content/renderer/audio_input_message_filter.h
+++ b/content/renderer/media/audio_input_message_filter.h
@@ -9,8 +9,8 @@
 // This implementation only supports low-latency (based on SyncSocket)
 // messaging.
 
-#ifndef CONTENT_RENDERER_AUDIO_INPUT_MESSAGE_FILTER_H_
-#define CONTENT_RENDERER_AUDIO_INPUT_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
 #pragma once
 
 #include "base/id_map.h"
@@ -87,4 +87,4 @@ class AudioInputMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputMessageFilter);
 };
 
-#endif  // CONTENT_RENDERER_AUDIO_INPUT_MESSAGE_FILTER_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
diff --git a/content/renderer/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index e3d5cff..a906a9c 100644
--- a/content/renderer/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/renderer/audio_message_filter.h"
+#include "content/renderer/media/audio_message_filter.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
diff --git a/content/renderer/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index 2403e8f..e4d4db0 100644
--- a/content/renderer/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
@@ -7,8 +7,8 @@
 // IO thread (main thread of render process), it intercepts audio messages
 // and process them on IO thread since these messages are time critical.
 
-#ifndef CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
-#define CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
@@ -117,4 +117,4 @@ class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_COPY_AND_ASSIGN(AudioMessageFilter);
 };
 
-#endif  // CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_
diff --git a/content/renderer/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc
index 1920823..37da0a6 100644
--- a/content/renderer/audio_message_filter_unittest.cc
+++ b/content/renderer/media/audio_message_filter_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/message_loop.h"
 #include "content/common/audio_messages.h"
-#include "content/renderer/audio_message_filter.h"
+#include "content/renderer/media/audio_message_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index c583c05..72c0ef6 100644
--- a/content/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -43,7 +43,7 @@
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/synchronization/lock.h"
-#include "content/renderer/audio_message_filter.h"
+#include "content/renderer/media/audio_message_filter.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/filters.h"
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 4367c4e..548990e 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -25,12 +25,12 @@
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/audio_message_filter.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/gpu/renderer_gl_context.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/p2p/p2p_transport_impl.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 #include "content/renderer/pepper_platform_video_decoder_impl.h"
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 804e730..2def6db 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -39,13 +39,13 @@
 #include "content/common/renderer_preferences.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/audio_message_filter.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/load_progress_tracker.h"
+#include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/navigation_state.h"
 #include "content/renderer/notification_provider.h"
diff --git a/content/renderer/renderer_webaudiodevice_impl.h b/content/renderer/renderer_webaudiodevice_impl.h
index e7316c6..a4f2f72 100644
--- a/content/renderer/renderer_webaudiodevice_impl.h
+++ b/content/renderer/renderer_webaudiodevice_impl.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/renderer/audio_device.h"
+#include "content/renderer/media/audio_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioDevice.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"