35 files changed, 124 insertions, 112 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 7f101f4..ed5e13b 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -95,12 +95,6 @@
         'renderer/external_host_bindings.h',
         'renderer/external_extension.cc',
         'renderer/external_extension.h',
-        'renderer/gpu_channel_host.cc',
-        'renderer/gpu_channel_host.h',
-        'renderer/gpu_video_decoder_host.cc',
-        'renderer/gpu_video_decoder_host.h',
-        'renderer/gpu_video_service_host.cc',
-        'renderer/gpu_video_service_host.h',
         'renderer/localized_error.cc',
         'renderer/localized_error.h',
         'renderer/load_progress_tracker.cc',
@@ -117,8 +111,6 @@
         'renderer/pepper_platform_context_3d_impl.h',
         'renderer/pepper_plugin_delegate_impl.cc',
         'renderer/pepper_plugin_delegate_impl.h',
-        'renderer/plugin_channel_host.cc',
-        'renderer/plugin_channel_host.h',
         'renderer/print_web_view_helper.cc',
         'renderer/print_web_view_helper.h',
         'renderer/print_web_view_helper_linux.cc',
@@ -221,18 +213,6 @@
         'renderer/visitedlink_slave.h',
         'renderer/web_ui_bindings.cc',
         'renderer/web_ui_bindings.h',
-        'renderer/webgraphicscontext3d_command_buffer_impl.cc',
-        'renderer/webgraphicscontext3d_command_buffer_impl.h',
-        'renderer/webplugin_delegate_proxy.cc',
-        'renderer/webplugin_delegate_proxy.h',
-        'renderer/websharedworker_proxy.cc',
-        'renderer/websharedworker_proxy.h',
-        'renderer/websharedworkerrepository_impl.cc',
-        'renderer/websharedworkerrepository_impl.h',
-        'renderer/webworker_base.cc',
-        'renderer/webworker_base.h',
-        'renderer/webworker_proxy.cc',
-        'renderer/webworker_proxy.h',
       ],
       'link_settings': {
         'mac_bundle_resources': [
@@ -285,15 +265,6 @@
             }],
           ],
         }],
-        ['enable_gpu==1', {
-          'dependencies': [
-            '../gpu/gpu.gyp:gles2_c_lib',
-          ],
-          'sources': [
-            'renderer/command_buffer_proxy.cc',
-            'renderer/command_buffer_proxy.h',
-          ],
-        }],
       ],
     },
     {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6db8bb3..dca08e7 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1749,7 +1749,6 @@
         'common/zip_unittest.cc',
         'renderer/extensions/extension_api_json_validity_unittest.cc',
         'renderer/extensions/json_schema_unittest.cc',
-        'renderer/gpu_video_decoder_host_unittest.cc',
         'renderer/net/predictor_queue_unittest.cc',
         'renderer/net/renderer_predictor_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
@@ -1839,6 +1838,7 @@
         '../content/gpu/gpu_video_decoder_unittest.cc',
         '../content/renderer/active_notification_tracker_unittest.cc',
         '../content/renderer/audio_message_filter_unittest.cc',
+        '../content/renderer/gpu_video_decoder_host_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',
diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc
index 8c114a4..5f7de8e 100644
--- a/chrome/renderer/devtools_agent_filter.cc
+++ b/chrome/renderer/devtools_agent_filter.cc
@@ -8,8 +8,8 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/devtools_agent.h"
-#include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_view.h"
+#include "content/renderer/plugin_channel_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
diff --git a/chrome/renderer/pepper_platform_context_3d_impl.cc b/chrome/renderer/pepper_platform_context_3d_impl.cc
index 52539ff..2691f61 100644
--- a/chrome/renderer/pepper_platform_context_3d_impl.cc
+++ b/chrome/renderer/pepper_platform_context_3d_impl.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/renderer/pepper_platform_context_3d_impl.h"
 
-#include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/ggl.h"
+#include "content/renderer/gpu_channel_host.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 e0fd67a..6b41bfd 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -18,20 +18,20 @@
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/pepper_platform_context_3d_impl.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
-#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
-#include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/pepper_file_messages.h"
 #include "content/common/pepper_messages.h"
 #include "content/renderer/audio_message_filter.h"
+#include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/ggl.h"
+#include "content/renderer/gpu_channel_host.h"
+#include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/renderer/webplugin_delegate_proxy.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_thread.cc b/chrome/renderer/render_thread.cc
index ddec3ed..40f9472 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -40,11 +40,8 @@
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_extension.h"
-#include "chrome/renderer/gpu_channel_host.h"
-#include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/loadtimes_extension_bindings.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
-#include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_process_impl.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/render_view_visitor.h"
@@ -68,7 +65,10 @@
 #include "content/common/web_database_observer_impl.h"
 #include "content/plugin/npobject_util.h"
 #include "content/renderer/cookie_message_filter.h"
+#include "content/renderer/gpu_channel_host.h"
+#include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/plugin_channel_host.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 86396da..9c440e9 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -63,7 +63,6 @@
 #include "chrome/renderer/navigation_state.h"
 #include "chrome/renderer/page_click_tracker.h"
 #include "chrome/renderer/page_load_histograms.h"
-#include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
@@ -83,10 +82,6 @@
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/web_ui_bindings.h"
-#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
-#include "chrome/renderer/webplugin_delegate_proxy.h"
-#include "chrome/renderer/websharedworker_proxy.h"
-#include "chrome/renderer/webworker_proxy.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/content_constants.h"
@@ -104,7 +99,12 @@
 #include "content/renderer/media/ipc_video_decoder.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
+#include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/speech_input_dispatcher.h"
+#include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/renderer/webplugin_delegate_proxy.h"
+#include "content/renderer/websharedworker_proxy.h"
+#include "content/renderer/webworker_proxy.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 ad8a206..6b39afe 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/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 "content/renderer/gpu_channel_host.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/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 8745f63..64a84d2 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -18,8 +18,6 @@
 #include "chrome/renderer/renderer_webidbfactory_impl.h"
 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/visitedlink_slave.h"
-#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
-#include "chrome/renderer/websharedworkerrepository_impl.h"
 #include "content/common/database_util.h"
 #include "content/common/file_system/webfilesystem_impl.h"
 #include "content/common/file_utilities_messages.h"
@@ -27,6 +25,8 @@
 #include "content/common/webblobregistry_impl.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/plugin/npobject_util.h"
+#include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/renderer/websharedworkerrepository_impl.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index ee7bbf1..239c922 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -13,6 +13,7 @@
         '../skia/skia.gyp:skia',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/npapi/npapi.gyp:npapi',
       ],
       'include_dirs': [
         '..',
@@ -32,6 +33,12 @@
         'renderer/geolocation_dispatcher.h',
         'renderer/ggl.cc',
         'renderer/ggl.h',
+        'renderer/gpu_channel_host.cc',
+        'renderer/gpu_channel_host.h',
+        'renderer/gpu_video_decoder_host.cc',
+        'renderer/gpu_video_decoder_host.h',
+        'renderer/gpu_video_service_host.cc',
+        'renderer/gpu_video_service_host.h',
         'renderer/indexed_db_dispatcher.cc',
         'renderer/indexed_db_dispatcher.h',
         'renderer/media/audio_renderer_impl.cc',
@@ -50,8 +57,38 @@
         'renderer/p2p/socket_client.h',
         'renderer/p2p/socket_dispatcher.cc',
         'renderer/p2p/socket_dispatcher.h',
+        'renderer/plugin_channel_host.cc',
+        'renderer/plugin_channel_host.h',
         'renderer/speech_input_dispatcher.cc',
         'renderer/speech_input_dispatcher.h',
+        'renderer/webgraphicscontext3d_command_buffer_impl.cc',
+        'renderer/webgraphicscontext3d_command_buffer_impl.h',
+        'renderer/webplugin_delegate_proxy.cc',
+        'renderer/webplugin_delegate_proxy.h',
+        'renderer/websharedworker_proxy.cc',
+        'renderer/websharedworker_proxy.h',
+        'renderer/websharedworkerrepository_impl.cc',
+        'renderer/websharedworkerrepository_impl.h',
+        'renderer/webworker_base.cc',
+        'renderer/webworker_base.h',
+        'renderer/webworker_proxy.cc',
+        'renderer/webworker_proxy.h',
+      ],
+      'conditions': [
+        ['enable_gpu==1', {
+          'dependencies': [
+            '../gpu/gpu.gyp:gles2_c_lib',
+          ],
+          'sources': [
+            'renderer/command_buffer_proxy.cc',
+            'renderer/command_buffer_proxy.h',
+          ],
+        }],
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
       ],
     },
   ],
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
new file mode 100644
index 0000000..03cc095
--- /dev/null
+++ b/content/renderer/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+content/plugin",  # For shared npruntime proxying code.
+]
diff --git a/chrome/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc
index c656d3e..7a5cc74 100644
--- a/chrome/renderer/command_buffer_proxy.cc
+++ b/content/renderer/command_buffer_proxy.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "content/renderer/command_buffer_proxy.h"
+
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/gpu_messages.h"
 #include "content/common/plugin_messages.h"
+#include "content/renderer/plugin_channel_host.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "ui/gfx/size.h"
 
diff --git a/chrome/renderer/command_buffer_proxy.h b/content/renderer/command_buffer_proxy.h
index fa3994c..a626cd9 100644
--- a/chrome/renderer/command_buffer_proxy.h
+++ b/content/renderer/command_buffer_proxy.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_COMMAND_BUFFER_PROXY_H_
-#define CHROME_RENDERER_COMMAND_BUFFER_PROXY_H_
+#ifndef CONTENT_RENDERER_COMMAND_BUFFER_PROXY_H_
+#define CONTENT_RENDERER_COMMAND_BUFFER_PROXY_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
@@ -128,4 +128,4 @@ class CommandBufferProxy : public gpu::CommandBuffer,
 
 #endif  // ENABLE_GPU
 
-#endif  // CHROME_RENDERER_COMMAND_BUFFER_PROXY_H_
+#endif  // CONTENT_RENDERER_COMMAND_BUFFER_PROXY_H_
diff --git a/content/renderer/ggl.cc b/content/renderer/ggl.cc
index e73f50d..9e8cf1f 100644
--- a/content/renderer/ggl.cc
+++ b/content/renderer/ggl.cc
@@ -7,10 +7,10 @@
 #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/gpu_channel_host.h"
-#include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/render_widget.h"
+#include "content/renderer/command_buffer_proxy.h"
+#include "content/renderer/gpu_channel_host.h"
+#include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/media/gles2_video_decode_context.h"
 #include "ipc/ipc_channel_handle.h"
 
diff --git a/chrome/renderer/gpu_channel_host.cc b/content/renderer/gpu_channel_host.cc
index 14b91b4..38e345d 100644
--- a/chrome/renderer/gpu_channel_host.cc
+++ b/content/renderer/gpu_channel_host.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/gpu_channel_host.h"
+#include "content/renderer/gpu_channel_host.h"
 
-#include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu_messages.h"
+#include "content/renderer/command_buffer_proxy.h"
+#include "content/renderer/gpu_video_service_host.h"
 
 GpuChannelHost::GpuChannelHost() : state_(kUnconnected) {
 }
diff --git a/chrome/renderer/gpu_channel_host.h b/content/renderer/gpu_channel_host.h
index fb099a6..0b7666e 100644
--- a/chrome/renderer/gpu_channel_host.h
+++ b/content/renderer/gpu_channel_host.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_GPU_CHANNEL_HOST_H_
-#define CHROME_RENDERER_GPU_CHANNEL_HOST_H_
+#ifndef CONTENT_RENDERER_GPU_CHANNEL_HOST_H_
+#define CONTENT_RENDERER_GPU_CHANNEL_HOST_H_
 #pragma once
 
 #include <string>
@@ -107,4 +107,4 @@ class GpuChannelHost : public IPC::Channel::Listener,
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
-#endif  // CHROME_RENDERER_GPU_CHANNEL_HOST_H_
+#endif  // CONTENT_RENDERER_GPU_CHANNEL_HOST_H_
diff --git a/chrome/renderer/gpu_video_decoder_host.cc b/content/renderer/gpu_video_decoder_host.cc
index 5afa69c..315cd32 100644
--- a/chrome/renderer/gpu_video_decoder_host.cc
+++ b/content/renderer/gpu_video_decoder_host.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/gpu_video_decoder_host.h"
+#include "content/renderer/gpu_video_decoder_host.h"
 
 #include "content/common/gpu_messages.h"
 #include "content/common/message_router.h"
diff --git a/chrome/renderer/gpu_video_decoder_host.h b/content/renderer/gpu_video_decoder_host.h
index 34b5903..faebb66 100644
--- a/chrome/renderer/gpu_video_decoder_host.h
+++ b/content/renderer/gpu_video_decoder_host.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_GPU_VIDEO_DECODER_HOST_H_
-#define CHROME_RENDERER_GPU_VIDEO_DECODER_HOST_H_
+#ifndef CONTENT_RENDERER_GPU_VIDEO_DECODER_HOST_H_
+#define CONTENT_RENDERER_GPU_VIDEO_DECODER_HOST_H_
 
 #include <deque>
 #include <map>
 
 #include "base/shared_memory.h"
 #include "base/singleton.h"
-#include "chrome/renderer/gpu_channel_host.h"
-#include "ipc/ipc_message.h"
+#include "content/renderer/gpu_channel_host.h"
 #include "media/base/buffers.h"
 #include "media/base/video_frame.h"
 #include "media/video/video_decode_engine.h"
@@ -163,4 +162,4 @@ class GpuVideoDecoderHost : public media::VideoDecodeEngine,
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoderHost);
 };
 
-#endif  // CHROME_RENDERER_GPU_VIDEO_DECODER_HOST_H_
+#endif  // CONTENT_RENDERER_GPU_VIDEO_DECODER_HOST_H_
diff --git a/chrome/renderer/gpu_video_decoder_host_unittest.cc b/content/renderer/gpu_video_decoder_host_unittest.cc
index 6186e48..e9f69a6 100644
--- a/chrome/renderer/gpu_video_decoder_host_unittest.cc
+++ b/content/renderer/gpu_video_decoder_host_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/renderer/gpu_video_decoder_host.h"
 #include "content/common/message_router.h"
 #include "content/common/gpu_messages.h"
+#include "content/renderer/gpu_video_decoder_host.h"
 #include "media/base/pipeline.h"
 #include "media/video/video_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/renderer/gpu_video_service_host.cc b/content/renderer/gpu_video_service_host.cc
index 221990f..412748d 100644
--- a/chrome/renderer/gpu_video_service_host.cc
+++ b/content/renderer/gpu_video_service_host.cc
@@ -2,10 +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/gpu_video_service_host.h"
+#include "content/renderer/gpu_video_service_host.h"
 
-#include "chrome/renderer/gpu_video_decoder_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/renderer/gpu_video_decoder_host.h"
 #include "content/common/gpu_messages.h"
 
 GpuVideoServiceHost::GpuVideoServiceHost()
diff --git a/chrome/renderer/gpu_video_service_host.h b/content/renderer/gpu_video_service_host.h
index c3c999e..543448d 100644
--- a/chrome/renderer/gpu_video_service_host.h
+++ b/content/renderer/gpu_video_service_host.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
-#define CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
+#ifndef CONTENT_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
+#define CONTENT_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
 
 #include "base/singleton.h"
-#include "chrome/renderer/gpu_channel_host.h"
-#include "chrome/renderer/gpu_video_decoder_host.h"
+#include "content/renderer/gpu_channel_host.h"
+#include "content/renderer/gpu_video_decoder_host.h"
 #include "ipc/ipc_channel.h"
 #include "media/base/buffers.h"
 #include "media/base/video_frame.h"
@@ -50,4 +50,4 @@ class GpuVideoServiceHost : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_COPY_AND_ASSIGN(GpuVideoServiceHost);
 };
 
-#endif  // CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
+#endif  // CONTENT_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
diff --git a/chrome/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc
index 4112c46..3d4993c 100644
--- a/chrome/renderer/plugin_channel_host.cc
+++ b/content/renderer/plugin_channel_host.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/plugin_channel_host.h"
+#include "content/renderer/plugin_channel_host.h"
 
 #include "content/common/plugin_messages.h"
 #include "content/plugin/npobject_base.h"
diff --git a/chrome/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h
index 247794e..3e84412 100644
--- a/chrome/renderer/plugin_channel_host.h
+++ b/content/renderer/plugin_channel_host.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_PLUGIN_CHANNEL_HOST_H_
-#define CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
+#ifndef CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_
+#define CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_
 #pragma once
 
 #include "base/hash_tables.h"
@@ -68,4 +68,4 @@ class PluginChannelHost : public PluginChannelBase {
   DISALLOW_COPY_AND_ASSIGN(PluginChannelHost);
 };
 
-#endif  // CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
+#endif  // CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 34e9aa7..8619e96 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -4,7 +4,7 @@
 
 #if defined(ENABLE_GPU)
 
-#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
@@ -19,9 +19,9 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#include "content/renderer/gpu_channel_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl()
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/webgraphicscontext3d_command_buffer_impl.h
index 70d14c4..122023a 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.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_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
-#define CHROME_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
+#ifndef CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
+#define CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
@@ -457,5 +457,5 @@ class WebGraphicsContext3DCommandBufferImpl
 };
 
 #endif  // defined(ENABLE_GPU)
-#endif  // CHROME_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
+#endif  // CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 273f591..e8ac928 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.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/webplugin_delegate_proxy.h"
+#include "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
@@ -22,16 +22,15 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/command_buffer_proxy.h"
-#include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "content/common/plugin_messages.h"
 #include "content/plugin/npobject_proxy.h"
 #include "content/plugin/npobject_stub.h"
 #include "content/plugin/npobject_util.h"
-#include "grit/generated_resources.h"
-#include "grit/renderer_resources.h"
+#include "content/renderer/command_buffer_proxy.h"
+#include "content/renderer/plugin_channel_host.h"
+//#include "grit/renderer_resources.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/platform_canvas.h"
@@ -1152,10 +1151,12 @@ void WebPluginDelegateProxy::OnMissingPluginStatus(int status) {
 void WebPluginDelegateProxy::PaintSadPlugin(WebKit::WebCanvas* native_context,
                                             const gfx::Rect& rect) {
   // Lazily load the sad plugin image.
+  /* temporarily disabled by jam
   if (!sad_plugin_) {
     sad_plugin_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_SAD_PLUGIN);
   }
+  */
   if (!sad_plugin_)
     return;
 
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h
index 3a84996..f495b89 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/content/renderer/webplugin_delegate_proxy.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_WEBPLUGIN_DELEGATE_PROXY_H_
-#define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
+#ifndef CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
+#define CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #pragma once
 
 #include <string>
@@ -272,4 +272,4 @@ class WebPluginDelegateProxy
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
-#endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
+#endif  // CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
diff --git a/chrome/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc
index a1e09fa..4af93e5 100644
--- a/chrome/renderer/websharedworker_proxy.cc
+++ b/content/renderer/websharedworker_proxy.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/websharedworker_proxy.h"
+#include "content/renderer/websharedworker_proxy.h"
 
 #include "chrome/common/render_messages.h"
 #include "content/common/webmessageportchannel_impl.h"
diff --git a/chrome/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h
index 37fa7c1..acc8dca 100644
--- a/chrome/renderer/websharedworker_proxy.h
+++ b/content/renderer/websharedworker_proxy.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_WEBSHAREDWORKER_PROXY_H_
-#define CHROME_RENDERER_WEBSHAREDWORKER_PROXY_H_
+#ifndef CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_
+#define CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/renderer/webworker_base.h"
+#include "content/renderer/webworker_base.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 
@@ -55,4 +55,4 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy);
 };
 
-#endif  // CHROME_RENDERER_WEBSHAREDWORKER_PROXY_H_
+#endif  // CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_
diff --git a/chrome/renderer/websharedworkerrepository_impl.cc b/content/renderer/websharedworkerrepository_impl.cc
index 29c9ed6..76c9bf1 100644
--- a/chrome/renderer/websharedworkerrepository_impl.cc
+++ b/content/renderer/websharedworkerrepository_impl.cc
@@ -2,11 +2,11 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/renderer/websharedworkerrepository_impl.h"
+#include "content/renderer/websharedworkerrepository_impl.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/websharedworker_proxy.h"
+#include "content/renderer/websharedworker_proxy.h"
 
 WebSharedWorkerRepositoryImpl::WebSharedWorkerRepositoryImpl() {}
 
diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/content/renderer/websharedworkerrepository_impl.h
index 8084ce0..8bd615c 100644
--- a/chrome/renderer/websharedworkerrepository_impl.h
+++ b/content/renderer/websharedworkerrepository_impl.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_WEBSHAREDWORKERREPOSITORY_IMPL_H_
-#define CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
+#ifndef CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
+#define CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
 #pragma once
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
@@ -32,4 +32,4 @@ class WebSharedWorkerRepositoryImpl : public WebKit::WebSharedWorkerRepository {
   DocumentSet shared_worker_parents_;
 };
 
-#endif  // CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
+#endif  // CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
diff --git a/chrome/renderer/webworker_base.cc b/content/renderer/webworker_base.cc
index a5b32c8..0741e79 100644
--- a/chrome/renderer/webworker_base.cc
+++ b/content/renderer/webworker_base.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/webworker_base.h"
+#include "content/renderer/webworker_base.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/renderer/webworker_base.h b/content/renderer/webworker_base.h
index 1acdb8f..7ea07b3 100644
--- a/chrome/renderer/webworker_base.h
+++ b/content/renderer/webworker_base.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_WEBWORKER_BASE_H_
-#define CHROME_RENDERER_WEBWORKER_BASE_H_
+#ifndef CONTENT_RENDERER_WEBWORKER_BASE_H_
+#define CONTENT_RENDERER_WEBWORKER_BASE_H_
 #pragma once
 
 #include <vector>
@@ -96,4 +96,4 @@ class WebWorkerBase : public IPC::Channel::Listener {
   std::vector<IPC::Message*> queued_messages_;
 };
 
-#endif  // CHROME_RENDERER_WEBWORKER_BASE_H_
+#endif  // CONTENT_RENDERER_WEBWORKER_BASE_H_
diff --git a/chrome/renderer/webworker_proxy.cc b/content/renderer/webworker_proxy.cc
index 6a7a496..53f97df 100644
--- a/chrome/renderer/webworker_proxy.cc
+++ b/content/renderer/webworker_proxy.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/webworker_proxy.h"
+#include "content/renderer/webworker_proxy.h"
 
 #include "chrome/common/render_messages.h"
 #include "content/common/child_thread.h"
diff --git a/chrome/renderer/webworker_proxy.h b/content/renderer/webworker_proxy.h
index ba11264..9151193 100644
--- a/chrome/renderer/webworker_proxy.h
+++ b/content/renderer/webworker_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_WEBWORKER_PROXY_H_
-#define CHROME_RENDERER_WEBWORKER_PROXY_H_
+#ifndef CONTENT_RENDERER_WEBWORKER_PROXY_H_
+#define CONTENT_RENDERER_WEBWORKER_PROXY_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/renderer/webworker_base.h"
+#include "content/renderer/webworker_base.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
 
@@ -63,4 +63,4 @@ class WebWorkerProxy : public WebKit::WebWorker, private WebWorkerBase {
   DISALLOW_COPY_AND_ASSIGN(WebWorkerProxy);
 };
 
-#endif  // CHROME_RENDERER_WEBWORKER_PROXY_H_
+#endif  // CONTENT_RENDERER_WEBWORKER_PROXY_H_