Move core renderer subdirectories to content.

TBR=avi
Review URL: http://codereview.chromium.org/6673090

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

28 files changed, 95 insertions, 75 deletions

diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 12f0538..988ae26 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -14,16 +14,15 @@
         'chrome_resources',
         'chrome_strings',
         'safe_browsing_proto',
+        '../content/content.gyp:content_renderer',
         '../content/content.gyp:content_plugin',
         '../ppapi/ppapi.gyp:ppapi_proxy',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/cld/cld.gyp:cld',
-        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../webkit/support/webkit_support.gyp:glue',
@@ -69,16 +68,8 @@
         'renderer/extensions/renderer_extension_bindings.h',
         'renderer/external_popup_menu.cc',
         'renderer/external_popup_menu.h',
-        'renderer/ggl/ggl.cc',
-        'renderer/ggl/ggl.h',
         'renderer/loadtimes_extension_bindings.h',
         'renderer/loadtimes_extension_bindings.cc',
-        'renderer/media/audio_renderer_impl.cc',
-        'renderer/media/audio_renderer_impl.h',
-        'renderer/media/gles2_video_decode_context.cc',
-        'renderer/media/gles2_video_decode_context.h',
-        'renderer/media/ipc_video_decoder.cc',
-        'renderer/media/ipc_video_decoder.h',
         'renderer/net/predictor_queue.cc',
         'renderer/net/predictor_queue.h',
         'renderer/net/renderer_net_predictor.cc',
@@ -131,14 +122,6 @@
         'renderer/notification_provider.cc',
         'renderer/notification_provider.h',
         'renderer/paint_aggregator.cc',
-        'renderer/p2p/ipc_network_manager.cc',
-        'renderer/p2p/ipc_network_manager.h',
-        'renderer/p2p/ipc_socket_factory.cc',
-        'renderer/p2p/ipc_socket_factory.h',
-        'renderer/p2p/socket_client.cc',
-        'renderer/p2p/socket_client.h',
-        'renderer/p2p/socket_dispatcher.cc',
-        'renderer/p2p/socket_dispatcher.h',
         'renderer/page_click_listener.h',
         'renderer/page_click_tracker.cc',
         'renderer/page_click_tracker.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 202fe80..23b364b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1757,7 +1757,6 @@
         'renderer/extensions/extension_api_json_validity_unittest.cc',
         'renderer/extensions/json_schema_unittest.cc',
         'renderer/gpu_video_decoder_host_unittest.cc',
-        'renderer/media/audio_renderer_impl_unittest.cc',
         'renderer/net/predictor_queue_unittest.cc',
         'renderer/net/renderer_predictor_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
@@ -1842,6 +1841,7 @@
         '../content/gpu/gpu_info_collector_unittest.cc',
         '../content/gpu/gpu_info_unittest_win.cc',
         '../content/gpu/gpu_video_decoder_unittest.cc',
+        '../content/renderer/media/audio_renderer_impl_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
diff --git a/chrome/renderer/pepper_platform_context_3d_impl.cc b/chrome/renderer/pepper_platform_context_3d_impl.cc
index 95afd35..52539ff 100644
--- a/chrome/renderer/pepper_platform_context_3d_impl.cc
+++ b/chrome/renderer/pepper_platform_context_3d_impl.cc
@@ -5,9 +5,9 @@
 #include "chrome/renderer/pepper_platform_context_3d_impl.h"
 
 #include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/renderer/ggl.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index a34f1e90..ad56c73 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -22,7 +22,6 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/audio_message_filter.h"
 #include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/pepper_platform_context_3d_impl.h"
 #include "chrome/renderer/render_thread.h"
@@ -32,6 +31,7 @@
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/renderer/ggl.h"
 #include "grit/locale_settings.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/c/dev/pp_video_dev.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index ab3d79a..472e6eb 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -64,14 +64,10 @@
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/external_popup_menu.h"
 #include "chrome/renderer/geolocation_dispatcher.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/load_progress_tracker.h"
 #include "chrome/renderer/localized_error.h"
-#include "chrome/renderer/media/audio_renderer_impl.h"
-#include "chrome/renderer/media/ipc_video_decoder.h"
 #include "chrome/renderer/navigation_state.h"
 #include "chrome/renderer/notification_provider.h"
-#include "chrome/renderer/p2p/socket_dispatcher.h"
 #include "chrome/renderer/page_click_tracker.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/plugin_channel_host.h"
@@ -105,6 +101,10 @@
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "content/common/notification_service.h"
+#include "content/renderer/ggl.h"
+#include "content/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/media/ipc_video_decoder.h"
+#include "content/renderer/p2p/socket_dispatcher.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "media/base/filter_collection.h"
diff --git a/chrome/renderer/render_widget_fullscreen_pepper.cc b/chrome/renderer/render_widget_fullscreen_pepper.cc
index 7e5101a..ad8a206 100644
--- a/chrome/renderer/render_widget_fullscreen_pepper.cc
+++ b/chrome/renderer/render_widget_fullscreen_pepper.cc
@@ -5,10 +5,10 @@
 #include "chrome/renderer/render_widget_fullscreen_pepper.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/pepper_platform_context_3d_impl.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/renderer/ggl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
index a7c80cf..70d14c4 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "chrome/renderer/ggl/ggl.h"
+#include "content/renderer/ggl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
diff --git a/content/content.gyp b/content/content.gyp
index 42c050b..b6764c8 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -12,6 +12,7 @@
     'content_gpu.gypi',
     'content_plugin.gypi',
     'content_ppapi_plugin.gypi',
+    'content_renderer.gypi',
     'content_worker.gypi',
   ],
 }
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
new file mode 100644
index 0000000..dfd5246
--- /dev/null
+++ b/content/content_renderer.gypi
@@ -0,0 +1,40 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'content_renderer',
+      'msvs_guid': '9AAA8CF2-9B3D-4895-8CB9-D70BBD125EAD',
+      'type': '<(library)',
+      'dependencies': [
+        'content_common',
+        '../skia/skia.gyp:skia',
+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'renderer/ggl.cc',
+        'renderer/ggl.h',
+        'renderer/media/audio_renderer_impl.cc',
+        'renderer/media/audio_renderer_impl.h',
+        'renderer/media/gles2_video_decode_context.cc',
+        'renderer/media/gles2_video_decode_context.h',
+        'renderer/media/ipc_video_decoder.cc',
+        'renderer/media/ipc_video_decoder.h',
+        'renderer/p2p/ipc_network_manager.cc',
+        'renderer/p2p/ipc_network_manager.h',
+        'renderer/p2p/ipc_socket_factory.cc',
+        'renderer/p2p/ipc_socket_factory.h',
+        'renderer/p2p/socket_client.cc',
+        'renderer/p2p/socket_client.h',
+        'renderer/p2p/socket_dispatcher.cc',
+        'renderer/p2p/socket_dispatcher.h',
+      ],
+    },
+  ],
+}
diff --git a/chrome/renderer/ggl/ggl.cc b/content/renderer/ggl.cc
index c13b02c..e73f50d 100644
--- a/chrome/renderer/ggl/ggl.cc
+++ b/content/renderer/ggl.cc
@@ -2,20 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
+#include "content/renderer/ggl.h"
 
 #include "base/lazy_instance.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/gpu_video_service_host.h"
-#include "chrome/renderer/media/gles2_video_decode_context.h"
 #include "chrome/renderer/render_widget.h"
+#include "content/renderer/media/gles2_video_decode_context.h"
 #include "ipc/ipc_channel_handle.h"
 
-
 #if defined(ENABLE_GPU)
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
diff --git a/chrome/renderer/ggl/ggl.h b/content/renderer/ggl.h
index 2dffdcd..fb96d2e 100644
--- a/chrome/renderer/ggl/ggl.h
+++ b/content/renderer/ggl.h
@@ -7,8 +7,8 @@
 // renderer process in a way that is consistent with other platforms. It is
 // a C style API to ease porting of existing OpenGL software to Chrome.
 
-#ifndef CHROME_RENDERER_GGL_GGL_H_
-#define CHROME_RENDERER_GGL_GGL_H_
+#ifndef CONTENT_RENDERER_GGL_H_
+#define CONTENT_RENDERER_GGL_H_
 #pragma once
 
 #include "base/callback.h"
@@ -172,4 +172,4 @@ CommandBufferProxy* GetCommandBufferProxy(Context* context);
 
 }  // namespace ggl
 
-#endif  // CHROME_RENDERER_GGL_GGL_H_
+#endif  // CONTENT_RENDERER_GGL_H_
diff --git a/chrome/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc
index de41c2a..86338e9 100644
--- a/chrome/renderer/media/audio_renderer_impl.cc
+++ b/content/renderer/media/audio_renderer_impl.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 "chrome/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/media/audio_renderer_impl.h"
 
 #include <math.h>
 
diff --git a/chrome/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index 9e8b93d..c9f11a3 100644
--- a/chrome/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -34,8 +34,8 @@
 // 3. Audio decoder thread (If there's one.)
 //    Responsible for decoding audio data and gives raw PCM data to this object.
 
-#ifndef CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
-#define CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
@@ -154,4 +154,4 @@ class AudioRendererImpl : public media::AudioRendererBase,
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
-#endif  // CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
diff --git a/chrome/renderer/media/audio_renderer_impl_unittest.cc b/content/renderer/media/audio_renderer_impl_unittest.cc
index 754c60d..43ff9e5 100644
--- a/chrome/renderer/media/audio_renderer_impl_unittest.cc
+++ b/content/renderer/media/audio_renderer_impl_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/process_util.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/media/audio_renderer_impl.h"
 #include "media/base/data_buffer.h"
 #include "media/base/media_format.h"
 #include "media/base/mock_callback.h"
diff --git a/chrome/renderer/media/gles2_video_decode_context.cc b/content/renderer/media/gles2_video_decode_context.cc
index 9712313..8ca9b02 100644
--- a/chrome/renderer/media/gles2_video_decode_context.cc
+++ b/content/renderer/media/gles2_video_decode_context.cc
@@ -5,8 +5,8 @@
 #include <GLES2/gl2.h>
 
 #include "base/message_loop.h"
-#include "chrome/renderer/ggl/ggl.h"
-#include "chrome/renderer/media/gles2_video_decode_context.h"
+#include "content/renderer/ggl.h"
+#include "content/renderer/media/gles2_video_decode_context.h"
 
 Gles2VideoDecodeContext::Gles2VideoDecodeContext(
     MessageLoop* message_loop, bool memory_mapped, ggl::Context* context)
diff --git a/chrome/renderer/media/gles2_video_decode_context.h b/content/renderer/media/gles2_video_decode_context.h
index 3fe9889..6ba7231 100644
--- a/chrome/renderer/media/gles2_video_decode_context.h
+++ b/content/renderer/media/gles2_video_decode_context.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 CHROME_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
-#define CHROME_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
+#ifndef CONTENT_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
+#define CONTENT_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
 
 #include <vector>
 
@@ -110,4 +110,4 @@ class Gles2VideoDecodeContext : public media::VideoDecodeContext {
   DISALLOW_COPY_AND_ASSIGN(Gles2VideoDecodeContext);
 };
 
-#endif  // CHROME_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
+#endif  // CONTENT_RENDERER_MEDIA_GLES2_VIDEO_DECODE_CONTEXT_H_
diff --git a/chrome/renderer/media/ipc_video_decoder.cc b/content/renderer/media/ipc_video_decoder.cc
index 361642b..8656e6f 100644
--- a/chrome/renderer/media/ipc_video_decoder.cc
+++ b/content/renderer/media/ipc_video_decoder.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/media/ipc_video_decoder.h"
+#include "content/renderer/media/ipc_video_decoder.h"
 
 #include "base/task.h"
-#include "chrome/renderer/ggl/ggl.h"
 #include "content/common/child_process.h"
+#include "content/renderer/ggl.h"
 #include "media/base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
diff --git a/chrome/renderer/media/ipc_video_decoder.h b/content/renderer/media/ipc_video_decoder.h
index 63702fa..28e9d33 100644
--- a/chrome/renderer/media/ipc_video_decoder.h
+++ b/content/renderer/media/ipc_video_decoder.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 CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
-#define CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
+#ifndef CONTENT_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
+#define CONTENT_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
 
 #include "base/time.h"
 #include "media/base/pts_heap.h"
@@ -89,4 +89,4 @@ class IpcVideoDecoder : public media::VideoDecoder,
   DISALLOW_COPY_AND_ASSIGN(IpcVideoDecoder);
 };
 
-#endif  // CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
+#endif  // CONTENT_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
diff --git a/chrome/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
index 70e84c6..204a699 100644
--- a/chrome/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.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 "chrome/renderer/p2p/ipc_network_manager.h"
+#include "content/renderer/p2p/ipc_network_manager.h"
 
 IpcNetworkManager::IpcNetworkManager(P2PSocketDispatcher* socket_dispatcher)
     : socket_dispatcher_(socket_dispatcher) {
diff --git a/chrome/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h
index 4775c70..9a1bbcb 100644
--- a/chrome/renderer/p2p/ipc_network_manager.h
+++ b/content/renderer/p2p/ipc_network_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 CHROME_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
-#define CHROME_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
+#ifndef CONTENT_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
+#define CONTENT_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
 
 #include <vector>
 
@@ -29,4 +29,4 @@ class IpcNetworkManager : public talk_base::NetworkManager {
   P2PSocketDispatcher* socket_dispatcher_;
 };
 
-#endif  // CHROME_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
+#endif  // CONTENT_RENDERER_P2P_IPC_NETWORK_MANAGER_H_
diff --git a/chrome/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 8e9b4b6..2b0b890 100644
--- a/chrome/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.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 "chrome/renderer/p2p/ipc_socket_factory.h"
+#include "content/renderer/p2p/ipc_socket_factory.h"
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "chrome/renderer/p2p/socket_client.h"
-#include "chrome/renderer/p2p/socket_dispatcher.h"
+#include "content/renderer/p2p/socket_client.h"
+#include "content/renderer/p2p/socket_dispatcher.h"
 #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 namespace {
diff --git a/chrome/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index 7c603dd..7f57348 100644
--- a/chrome/renderer/p2p/ipc_socket_factory.h
+++ b/content/renderer/p2p/ipc_socket_factory.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 CHROME_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
-#define CHROME_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
+#ifndef CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
+#define CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
@@ -40,4 +40,4 @@ class IpcPacketSocketFactory : public talk_base::PacketSocketFactory {
   DISALLOW_COPY_AND_ASSIGN(IpcPacketSocketFactory);
 };
 
-#endif  // CHROME_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
+#endif  // CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
diff --git a/chrome/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc
index f799eea..c038c19 100644
--- a/chrome/renderer/p2p/socket_client.cc
+++ b/content/renderer/p2p/socket_client.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/p2p/socket_client.h"
+#include "content/renderer/p2p/socket_client.h"
 
 #include "base/message_loop_proxy.h"
-#include "chrome/renderer/p2p/socket_dispatcher.h"
 #include "content/common/p2p_messages.h"
+#include "content/renderer/p2p/socket_dispatcher.h"
 
 P2PSocketClient::P2PSocketClient(P2PSocketDispatcher* dispatcher)
     : dispatcher_(dispatcher),
diff --git a/chrome/renderer/p2p/socket_client.h b/content/renderer/p2p/socket_client.h
index 17b38ca..3f0dd23 100644
--- a/chrome/renderer/p2p/socket_client.h
+++ b/content/renderer/p2p/socket_client.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 CHROME_RENDERER_P2P_SOCKET_CLIENT_H_
-#define CHROME_RENDERER_P2P_SOCKET_CLIENT_H_
+#ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
+#define CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
 
 #include <vector>
 
@@ -99,4 +99,4 @@ class P2PSocketClient : public base::RefCountedThreadSafe<P2PSocketClient> {
   DISALLOW_COPY_AND_ASSIGN(P2PSocketClient);
 };
 
-#endif  // CHROME_RENDERER_P2P_SOCKET_CLIENT_H_
+#endif  // CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
diff --git a/chrome/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index 221683d..8ea729c 100644
--- a/chrome/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/p2p/socket_dispatcher.h"
+#include "content/renderer/p2p/socket_dispatcher.h"
 
 #include "base/message_loop_proxy.h"
 #include "content/common/p2p_messages.h"
-#include "ipc/ipc_message.h"
-#include "ipc/ipc_message_macros.h"
 
 P2PSocketDispatcher::P2PSocketDispatcher(RenderView* render_view)
     : RenderViewObserver(render_view),
diff --git a/chrome/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 076d051..93b9da0 100644
--- a/chrome/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -16,15 +16,15 @@
 //      P2PSocketsHost  <--------->  P2PSocketDispatcher
 //
 
-#ifndef CHROME_RENDERER_P2P_SOCKET_DISPATCHER_H_
-#define CHROME_RENDERER_P2P_SOCKET_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_
+#define CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_
 
 #include <vector>
 
 #include "base/id_map.h"
-#include "chrome/renderer/p2p/socket_client.h"
-#include "content/common/p2p_sockets.h"
 #include "chrome/renderer/render_view_observer.h"
+#include "content/common/p2p_sockets.h"
+#include "content/renderer/p2p/socket_client.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -68,4 +68,4 @@ class P2PSocketDispatcher : public RenderViewObserver {
   DISALLOW_COPY_AND_ASSIGN(P2PSocketDispatcher);
 };
 
-#endif  // CHROME_RENDERER_P2P_SOCKET_DISPATCHER_H_
+#endif  // CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_
diff --git a/remoting/client/DEPS b/remoting/client/DEPS
index 73df734..fa11a6a 100644
--- a/remoting/client/DEPS
+++ b/remoting/client/DEPS
@@ -8,5 +8,5 @@ include_rules = [
 
   # TODO(sergeyu): Remove this dependency: crbug.com/74951 .
   "+webkit/plugins/ppapi",
-  "+chrome/renderer/p2p",
+  "+content/renderer/p2p",
 ]
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 09dbc48..45497c5 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -14,8 +14,8 @@
 // TODO(sergeyu): We should not depend on renderer here. Instead P2P
 // Pepper API should be used. Remove this dependency.
 // crbug.com/74951
-#include "chrome/renderer/p2p/ipc_network_manager.h"
-#include "chrome/renderer/p2p/ipc_socket_factory.h"
+#include "content/renderer/p2p/ipc_network_manager.h"
+#include "content/renderer/p2p/ipc_socket_factory.h"
 #include "ppapi/c/pp_input_event.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/rect.h"