23 files changed, 64 insertions, 64 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_host.cc b/content/browser/browser_plugin/old/browser_plugin_host.cc
index 28e4e8f..9997f09 100644
--- a/content/browser/browser_plugin/browser_plugin_host.cc
+++ b/content/browser/browser_plugin/old/browser_plugin_host.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/browser_plugin/browser_plugin_host.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host.h"
 
-#include "content/browser/browser_plugin/browser_plugin_host_helper.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
diff --git a/content/browser/browser_plugin/browser_plugin_host.h b/content/browser/browser_plugin/old/browser_plugin_host.h
index 7b8f18e..3e86502 100644
--- a/content/browser/browser_plugin/browser_plugin_host.h
+++ b/content/browser/browser_plugin/old/browser_plugin_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 CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_H__
-#define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_H__
+#ifndef CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H__
+#define CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H__
 #pragma once
 
 #include <map>
@@ -126,4 +126,4 @@ class BrowserPluginHost : public WebContentsObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_H_
+#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H_
diff --git a/content/browser/browser_plugin/browser_plugin_host_helper.cc b/content/browser/browser_plugin/old/browser_plugin_host_helper.cc
index d7bd973..794aed4 100644
--- a/content/browser/browser_plugin/browser_plugin_host_helper.cc
+++ b/content/browser/browser_plugin/old/browser_plugin_host_helper.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/browser_plugin/browser_plugin_host_helper.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host_helper.h"
 
-#include "content/browser/browser_plugin/browser_plugin_host.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
diff --git a/content/browser/browser_plugin/browser_plugin_host_helper.h b/content/browser/browser_plugin/old/browser_plugin_host_helper.h
index f96892b..05b8259 100644
--- a/content/browser/browser_plugin/browser_plugin_host_helper.h
+++ b/content/browser/browser_plugin/old/browser_plugin_host_helper.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_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_HELPER_H__
-#define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_HELPER_H__
+#ifndef CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_HELPER_H__
+#define CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_HELPER_H__
 #pragma once
 
 #include <string>
@@ -46,5 +46,5 @@ class BrowserPluginHostHelper : public RenderViewHostObserver {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_HELPER_H__
+#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_HELPER_H__
 
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c077141..f00fd5d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -14,7 +14,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/browser_plugin/browser_plugin_host.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 7a9c198..cc18b58 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/property_bag.h"
-#include "content/browser/browser_plugin/browser_plugin_host.h"
+#include "content/browser/browser_plugin/old/browser_plugin_host.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 168a9ad..82e28070 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -221,10 +221,10 @@
     'browser/browser_main_loop.cc',
     'browser/browser_main_loop.h',
     'browser/browser_main_runner.cc',
-    'browser/browser_plugin/browser_plugin_host.cc',
-    'browser/browser_plugin/browser_plugin_host.h',
-    'browser/browser_plugin/browser_plugin_host_helper.cc',
-    'browser/browser_plugin/browser_plugin_host_helper.h',
+    'browser/browser_plugin/old/browser_plugin_host.cc',
+    'browser/browser_plugin/old/browser_plugin_host.h',
+    'browser/browser_plugin/old/browser_plugin_host_helper.cc',
+    'browser/browser_plugin/old/browser_plugin_host_helper.h',
     'browser/browser_process_sub_thread.cc',
     'browser/browser_process_sub_thread.h',
     'browser/browser_thread_impl.cc',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 8f26bf3..0b37609 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -162,18 +162,18 @@
     'renderer/pepper/pepper_proxy_channel_delegate_impl.h',
     'renderer/plugin_channel_host.cc',
     'renderer/plugin_channel_host.h',
-    'renderer/browser_plugin/browser_plugin.cc',
-    'renderer/browser_plugin/browser_plugin.h',
-    'renderer/browser_plugin/browser_plugin_channel_manager.cc',
-    'renderer/browser_plugin/browser_plugin_channel_manager.h',
-    'renderer/browser_plugin/browser_plugin_constants.cc',
-    'renderer/browser_plugin/browser_plugin_constants.h',
-    'renderer/browser_plugin/browser_plugin_registry.cc',
-    'renderer/browser_plugin/browser_plugin_registry.h',
-    'renderer/browser_plugin/browser_plugin_var_serialization_rules.cc',
-    'renderer/browser_plugin/browser_plugin_var_serialization_rules.h',
-    'renderer/browser_plugin/guest_to_embedder_channel.cc',
-    'renderer/browser_plugin/guest_to_embedder_channel.h',
+    'renderer/browser_plugin/old/browser_plugin.cc',
+    'renderer/browser_plugin/old/browser_plugin.h',
+    'renderer/browser_plugin/old/browser_plugin_channel_manager.cc',
+    'renderer/browser_plugin/old/browser_plugin_channel_manager.h',
+    'renderer/browser_plugin/old/browser_plugin_constants.cc',
+    'renderer/browser_plugin/old/browser_plugin_constants.h',
+    'renderer/browser_plugin/old/browser_plugin_registry.cc',
+    'renderer/browser_plugin/old/browser_plugin_registry.h',
+    'renderer/browser_plugin/old/browser_plugin_var_serialization_rules.cc',
+    'renderer/browser_plugin/old/browser_plugin_var_serialization_rules.h',
+    'renderer/browser_plugin/old/guest_to_embedder_channel.cc',
+    'renderer/browser_plugin/old/guest_to_embedder_channel.h',
     'renderer/render_process.h',
     'renderer/render_process_impl.cc',
     'renderer/render_process_impl.h',
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/old/browser_plugin.cc
index 8be36e8..c57fba3 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/old/browser_plugin.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/browser_plugin/browser_plugin.h"
+#include "content/renderer/browser_plugin/old/browser_plugin.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/id_map.h"
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/old/browser_plugin.h
index b1b2112..a4b6f9c 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/old/browser_plugin.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_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_H_
 #pragma once
 
 #include "base/process.h"
@@ -87,4 +87,4 @@ class BrowserPlugin {
   DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
 };
 
-#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
+#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_H_
diff --git a/content/renderer/browser_plugin/browser_plugin_channel_manager.cc b/content/renderer/browser_plugin/old/browser_plugin_channel_manager.cc
index 0a49e9d..e00df2b 100644
--- a/content/renderer/browser_plugin/browser_plugin_channel_manager.cc
+++ b/content/renderer/browser_plugin/old/browser_plugin_channel_manager.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 "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
 
 #include "base/process_util.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/browser_plugin/browser_plugin.h"
-#include "content/renderer/browser_plugin/guest_to_embedder_channel.h"
+#include "content/renderer/browser_plugin/old/browser_plugin.h"
+#include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "ppapi/c/pp_instance.h"
diff --git a/content/renderer/browser_plugin/browser_plugin_channel_manager.h b/content/renderer/browser_plugin/old/browser_plugin_channel_manager.h
index cbe578d..4656139 100644
--- a/content/renderer/browser_plugin/browser_plugin_channel_manager.h
+++ b/content/renderer/browser_plugin/old/browser_plugin_channel_manager.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
 #pragma once
 
 #include <set>
 
 #include "base/id_map.h"
 #include "content/public/renderer/render_process_observer.h"
-#include "content/renderer/browser_plugin/guest_to_embedder_channel.h"
+#include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h"
 #include "content/renderer/render_view_impl.h"
 
 class GuestToEmbedderChannel;
diff --git a/content/renderer/browser_plugin/browser_plugin_constants.cc b/content/renderer/browser_plugin/old/browser_plugin_constants.cc
index b1543ac..020385a 100644
--- a/content/renderer/browser_plugin/browser_plugin_constants.cc
+++ b/content/renderer/browser_plugin/old/browser_plugin_constants.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/browser_plugin/browser_plugin_constants.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_constants.h"
 
 const char kBrowserPluginName[] = "Browser Plugin";
 const FilePath::CharType kBrowserPluginPath[] =
diff --git a/content/renderer/browser_plugin/browser_plugin_constants.h b/content/renderer/browser_plugin/old/browser_plugin_constants.h
index fe70e0b..01748d8 100644
--- a/content/renderer/browser_plugin/browser_plugin_constants.h
+++ b/content/renderer/browser_plugin/old/browser_plugin_constants.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_BROWSER_PLUGIN_BROWSER_PLUGIN_CONSTANTS_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CONSTANTS_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_CONSTANTS_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_CONSTANTS_H_
 #pragma once
 
 #include "base/file_path.h"
@@ -12,4 +12,4 @@ extern const char kBrowserPluginName[];
 extern const FilePath::CharType kBrowserPluginPath[];
 extern const char kBrowserPluginDescription[];
 
-#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CONSTANTS_H_
+#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_CONSTANTS_H_
diff --git a/content/renderer/browser_plugin/browser_plugin_registry.cc b/content/renderer/browser_plugin/old/browser_plugin_registry.cc
index 14725e7..823fd80 100644
--- a/content/renderer/browser_plugin/browser_plugin_registry.cc
+++ b/content/renderer/browser_plugin/old/browser_plugin_registry.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/browser_plugin/browser_plugin_registry.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_registry.h"
 
 #include "base/logging.h"
 
diff --git a/content/renderer/browser_plugin/browser_plugin_registry.h b/content/renderer/browser_plugin/old/browser_plugin_registry.h
index 7740015..54f0c13 100644
--- a/content/renderer/browser_plugin/browser_plugin_registry.h
+++ b/content/renderer/browser_plugin/old/browser_plugin_registry.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_BROWSER_PLUGIN_BROWSER_PLUGIN_REGISTRY_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_REGISTRY_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_REGISTRY_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_REGISTRY_H_
 #pragma once
 
 #include "base/id_map.h"
@@ -34,4 +34,4 @@ class BrowserPluginRegistry
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_REGISTRY_H_
+#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_REGISTRY_H_
diff --git a/content/renderer/browser_plugin/browser_plugin_var_serialization_rules.cc b/content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.cc
index 874527c..0091c8c 100644
--- a/content/renderer/browser_plugin/browser_plugin_var_serialization_rules.cc
+++ b/content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.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/browser_plugin/browser_plugin_var_serialization_rules.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.h"
 
 #include "base/logging.h"
 
diff --git a/content/renderer/browser_plugin/browser_plugin_var_serialization_rules.h b/content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.h
index f169912..cf669d6 100644
--- a/content/renderer/browser_plugin/browser_plugin_var_serialization_rules.h
+++ b/content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.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_BROWSER_PLUGIN_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
 
 #include "ppapi/proxy/var_serialization_rules.h"
 
@@ -32,4 +32,4 @@ class BrowserPluginVarSerializationRules :
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
+#endif  // CONTENT_RENDERER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_VAR_SERIALIZATION_RULES_H_
diff --git a/content/renderer/browser_plugin/guest_to_embedder_channel.cc b/content/renderer/browser_plugin/old/guest_to_embedder_channel.cc
index 4edd0a4..deffad5 100644
--- a/content/renderer/browser_plugin/guest_to_embedder_channel.cc
+++ b/content/renderer/browser_plugin/old/guest_to_embedder_channel.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 "content/renderer/browser_plugin/guest_to_embedder_channel.h"
+#include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h"
 
 #include "base/process_util.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/common/child_process.h"
-#include "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
-#include "content/renderer/browser_plugin/browser_plugin_var_serialization_rules.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_var_serialization_rules.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "ppapi/c/pp_bool.h"
diff --git a/content/renderer/browser_plugin/guest_to_embedder_channel.h b/content/renderer/browser_plugin/old/guest_to_embedder_channel.h
index 1eb83ce..83bf6e3 100644
--- a/content/renderer/browser_plugin/guest_to_embedder_channel.h
+++ b/content/renderer/browser_plugin/old/guest_to_embedder_channel.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_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_
-#define CONTENT_RENDERER_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_
+#ifndef CONTENT_RENDERER_BROWSER_PLUGIN_OLD_GUEST_TO_EMBEDDER_CHANNEL_H_
+#define CONTENT_RENDERER_BROWSER_PLUGIN_OLD_GUEST_TO_EMBEDDER_CHANNEL_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -135,4 +135,4 @@ class GuestToEmbedderChannel
 
 }  // namespace content
 
-#endif // CONTENT_RENDERER_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_
+#endif // CONTENT_RENDERER_BROWSER_PLUGIN_OLD_GUEST_TO_EMBEDDER_CHANNEL_H_
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index 18c40a9..39401e8 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -33,8 +33,8 @@
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/browser_plugin/browser_plugin_constants.h"
-#include "content/renderer/browser_plugin/browser_plugin_registry.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_constants.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_registry.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
 #include "content/renderer/media/audio_hardware.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index d3729aa..03d56c3 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -46,8 +46,8 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
-#include "content/renderer/browser_plugin/browser_plugin_registry.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_registry.h"
 #include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
 #include "content/renderer/dom_storage/webstoragearea_impl.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index ba634a3..b4ff5f5 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -56,10 +56,10 @@
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/renderer/browser_plugin/browser_plugin.h"
-#include "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
-#include "content/renderer/browser_plugin/browser_plugin_constants.h"
-#include "content/renderer/browser_plugin/guest_to_embedder_channel.h"
+#include "content/renderer/browser_plugin/old/browser_plugin.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
+#include "content/renderer/browser_plugin/old/browser_plugin_constants.h"
+#include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/dom_automation_controller.h"