8 files changed, 10 insertions, 10 deletions
diff --git a/media/audio/audio_device_thread.h b/media/audio/audio_device_thread.h
index 22ff077..976f883 100644
--- a/media/audio/audio_device_thread.h
+++ b/media/audio/audio_device_thread.h
@@ -8,12 +8,12 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/synchronization/lock.h"
-#include "media/base/media_export.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/shared_memory_util.h"
+#include "media/base/media_export.h"
 
 namespace base {
 class MessageLoop;
diff --git a/media/audio/audio_input_device.h b/media/audio/audio_input_device.h
index 6a7b304..bb7d0ff 100644
--- a/media/audio/audio_input_device.h
+++ b/media/audio/audio_input_device.h
@@ -58,7 +58,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "media/audio/audio_device_thread.h"
 #include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_parameters.h"
diff --git a/media/audio/audio_input_ipc.h b/media/audio/audio_input_ipc.h
index 19ec376..0e6f2c3 100644
--- a/media/audio/audio_input_ipc.h
+++ b/media/audio/audio_input_ipc.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_IPC_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_IPC_H_
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_export.h"
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 2af4f48..bdcd0b1 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -61,14 +61,14 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
-#include "base/shared_memory.h"
-#include "media/base/media_export.h"
 #include "media/audio/audio_device_thread.h"
 #include "media/audio/audio_output_ipc.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/scoped_loop_observer.h"
 #include "media/base/audio_renderer_sink.h"
+#include "media/base/media_export.h"
 
 namespace media {
 
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 5616ff9..364a2dd 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -5,9 +5,9 @@
 #include <vector>
 
 #include "base/at_exit.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/test/test_timeouts.h"
 #include "media/audio/audio_output_device.h"
diff --git a/media/audio/audio_output_ipc.h b/media/audio/audio_output_ipc.h
index 84f8c6a..3353735 100644
--- a/media/audio/audio_output_ipc.h
+++ b/media/audio/audio_output_ipc.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_IPC_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_IPC_H_
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_export.h"
diff --git a/media/audio/cross_process_notification_unittest.cc b/media/audio/cross_process_notification_unittest.cc
index d1fbead..2e7ce34 100644
--- a/media/audio/cross_process_notification_unittest.cc
+++ b/media/audio/cross_process_notification_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/stl_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/threading/platform_thread.h"
diff --git a/media/audio/shared_memory_util.h b/media/audio/shared_memory_util.h
index 2ae6ffe..9186d5c 100644
--- a/media/audio/shared_memory_util.h
+++ b/media/audio/shared_memory_util.h
@@ -6,7 +6,7 @@
 #define MEDIA_AUDIO_SHARED_MEMORY_UTIL_H_
 
 #include "base/basictypes.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "media/base/media_export.h"
 
 namespace media {