Move V8ValueConverter from content/renderer to content/child.

This will be used by changes in content/child/webmessageportchannel_impl.cc
in a future CL to enable conversions between v8::Value and base::Value.

BUG=426458

Review URL: https://codereview.chromium.org/921543002

Cr-Commit-Position: refs/heads/master@{#316117}

41 files changed, 49 insertions, 48 deletions

diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS
index 7f387ce..b6ab042 100644
--- a/android_webview/renderer/DEPS
+++ b/android_webview/renderer/DEPS
@@ -9,6 +9,7 @@ include_rules = [
   "+components/printing/renderer",
   "+components/visitedlink/renderer",
 
+  "+content/public/child",
   "+content/public/renderer",
 
   "+media/base",
diff --git a/android_webview/renderer/aw_message_port_client.cc b/android_webview/renderer/aw_message_port_client.cc
index c9a403d..7a5f67e 100644
--- a/android_webview/renderer/aw_message_port_client.cc
+++ b/android_webview/renderer/aw_message_port_client.cc
@@ -5,9 +5,9 @@
 #include "android_webview/renderer/aw_message_port_client.h"
 
 #include "android_webview/common/aw_message_port_messages.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
index c13d741..98b6b16 100644
--- a/chrome/renderer/extensions/app_bindings.cc
+++ b/chrome/renderer/extensions/app_bindings.cc
@@ -11,8 +11,8 @@
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
diff --git a/chrome/renderer/extensions/automation_internal_custom_bindings.cc b/chrome/renderer/extensions/automation_internal_custom_bindings.cc
index 2e068b2..dd60d72 100644
--- a/chrome/renderer/extensions/automation_internal_custom_bindings.cc
+++ b/chrome/renderer/extensions/automation_internal_custom_bindings.cc
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/extensions/manifest_handlers/automation.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/renderer/script_context.h"
diff --git a/chrome/renderer/extensions/cast_streaming_native_handler.cc b/chrome/renderer/extensions/cast_streaming_native_handler.cc
index b923ca4..a10a154 100644
--- a/chrome/renderer/extensions/cast_streaming_native_handler.cc
+++ b/chrome/renderer/extensions/cast_streaming_native_handler.cc
@@ -15,7 +15,7 @@
 #include "chrome/renderer/media/cast_rtp_stream.h"
 #include "chrome/renderer/media/cast_session.h"
 #include "chrome/renderer/media/cast_udp_transport.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "extensions/renderer/script_context.h"
 #include "net/base/host_port_pair.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
diff --git a/chrome/renderer/extensions/notifications_native_handler.cc b/chrome/renderer/extensions/notifications_native_handler.cc
index 0100fbd..d87fbde 100644
--- a/chrome/renderer/extensions/notifications_native_handler.cc
+++ b/chrome/renderer/extensions/notifications_native_handler.cc
@@ -10,7 +10,7 @@
 #include "base/values.h"
 #include "chrome/common/extensions/api/notifications/notification_style.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "ui/base/layout.h"
 
 namespace extensions {
diff --git a/chrome/renderer/extensions/platform_keys_natives.cc b/chrome/renderer/extensions/platform_keys_natives.cc
index 779b909..5e4b770 100644
--- a/chrome/renderer/extensions/platform_keys_natives.cc
+++ b/chrome/renderer/extensions/platform_keys_natives.cc
@@ -8,7 +8,7 @@
 
 #include "base/values.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/child/DEPS b/content/child/DEPS
index be1e09f..9cfa5d1 100644
--- a/content/child/DEPS
+++ b/content/child/DEPS
@@ -3,10 +3,5 @@ include_rules = [
   "+content/app/strings/grit",  # For generated headers
   "+content/public/child",
   "+media/base/android",
+  "+v8/include/v8.h"
 ]
-
-specific_include_rules = {
-  "content_child_helpers\.cc": [
-    "+v8/include/v8.h"
-  ]
-}
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index 62c1136..6ff8797 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_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 "content/renderer/v8_value_converter_impl.h"
+#include "content/child/v8_value_converter_impl.h"
 
 #include <string>
 
diff --git a/content/renderer/v8_value_converter_impl.h b/content/child/v8_value_converter_impl.h
index decc10b..c150d5a 100644
--- a/content/renderer/v8_value_converter_impl.h
+++ b/content/child/v8_value_converter_impl.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_V8_VALUE_CONVERTER_IMPL_H_
-#define CONTENT_RENDERER_V8_VALUE_CONVERTER_IMPL_H_
+#ifndef CONTENT_CHILD_V8_VALUE_CONVERTER_IMPL_H_
+#define CONTENT_CHILD_V8_VALUE_CONVERTER_IMPL_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 
 namespace base {
 class BinaryValue;
@@ -95,4 +95,4 @@ class CONTENT_EXPORT V8ValueConverterImpl : public V8ValueConverter {
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_V8_VALUE_CONVERTER_IMPL_H_
+#endif  // CONTENT_CHILD_V8_VALUE_CONVERTER_IMPL_H_
diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/child/v8_value_converter_impl_unittest.cc
index 5cd30a9..9ca3aea 100644
--- a/content/renderer/v8_value_converter_impl_unittest.cc
+++ b/content/child/v8_value_converter_impl_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/stl_util.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
-#include "content/renderer/v8_value_converter_impl.h"
+#include "content/child/v8_value_converter_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "v8/include/v8.h"
 
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 509fed3..bf9d0d8 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -27,6 +27,7 @@
       'public/child/image_decoder_utils.h',
       'public/child/request_peer.h',
       'public/child/resource_dispatcher_delegate.h',
+      'public/child/v8_value_converter.h',
     ],
     'private_child_sources': [
       'child/appcache/appcache_backend_proxy.cc',
@@ -219,6 +220,8 @@
       'child/thread_safe_sender.h',
       'child/threaded_data_provider.cc',
       'child/threaded_data_provider.h',
+      'child/v8_value_converter_impl.cc',
+      'child/v8_value_converter_impl.h',
       'child/web_data_consumer_handle_impl.cc',
       'child/web_data_consumer_handle_impl.h',
       'child/web_database_observer_impl.cc',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index b36a6ee..d639621 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -73,7 +73,6 @@
       'public/renderer/render_view_observer_tracker.h',
       'public/renderer/render_view_visitor.h',
       'public/renderer/resource_fetcher.h',
-      'public/renderer/v8_value_converter.h',
       'public/renderer/video_encode_accelerator.cc',
       'public/renderer/video_encode_accelerator.h',
     ],
@@ -414,8 +413,6 @@
       'renderer/stats_collection_observer.h',
       'renderer/text_input_client_observer.cc',
       'renderer/text_input_client_observer.h',
-      'renderer/v8_value_converter_impl.cc',
-      'renderer/v8_value_converter_impl.h',
       'renderer/web_ui_extension.cc',
       'renderer/web_ui_extension.h',
       'renderer/web_ui_extension_data.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 4dfb64d..bb62823 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -571,6 +571,7 @@
       'child/resource_dispatcher_unittest.cc',
       'child/simple_webmimeregistry_impl_unittest.cc',
       'child/site_isolation_policy_unittest.cc',
+      'child/v8_value_converter_impl_unittest.cc',
       'child/web_data_consumer_handle_impl_unittest.cc',
       'child/web_gesture_curve_impl_unittest.cc',
       'child/web_url_loader_impl_unittest.cc',
@@ -658,7 +659,6 @@
       'renderer/scheduler/task_queue_manager_unittest.cc',
       'renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc',
       'renderer/skia_benchmarking_extension_unittest.cc',
-      'renderer/v8_value_converter_impl_unittest.cc',
       'test/fileapi_test_file_set.cc',
       'test/fileapi_test_file_set.h',
       'test/image_decoder_test.cc',
diff --git a/content/public/child/DEPS b/content/public/child/DEPS
new file mode 100644
index 0000000..fdd9052
--- /dev/null
+++ b/content/public/child/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+v8/include/v8.h",
+]
diff --git a/content/public/renderer/v8_value_converter.h b/content/public/child/v8_value_converter.h
index f3fd126..bd0d454 100644
--- a/content/public/renderer/v8_value_converter.h
+++ b/content/public/child/v8_value_converter.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_PUBLIC_RENDERER_V8_VALUE_CONVERTER_H_
-#define CONTENT_PUBLIC_RENDERER_V8_VALUE_CONVERTER_H_
+#ifndef CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_
+#define CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_
 
 #include "base/callback.h"
 #include "content/common/content_export.h"
@@ -124,4 +124,4 @@ class CONTENT_EXPORT V8ValueConverter {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_V8_VALUE_CONVERTER_H_
+#endif  // CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 30359e6..076c112 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+cc/blink",
+  "+content/public/child",
   "+content/public/renderer",
   "+content/child",
   "+device/battery",  # For battery status service.
diff --git a/content/renderer/dom_automation_controller.cc b/content/renderer/dom_automation_controller.cc
index 13191d8b..b002b6c 100644
--- a/content/renderer/dom_automation_controller.cc
+++ b/content/renderer/dom_automation_controller.cc
@@ -6,10 +6,10 @@
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_util.h"
+#include "content/child/v8_value_converter_impl.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/renderer/render_view_impl.h"
-#include "content/renderer/v8_value_converter_impl.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index a83c02a..6822188 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -16,8 +16,8 @@
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "content/renderer/chrome_object_extensions_utils.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/java/gin_java_bridge_object.cc b/content/renderer/java/gin_java_bridge_object.cc
index b4cf3bf..7c43276 100644
--- a/content/renderer/java/gin_java_bridge_object.cc
+++ b/content/renderer/java/gin_java_bridge_object.cc
@@ -7,7 +7,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/android/gin_java_bridge_errors.h"
 #include "content/common/android/gin_java_bridge_value.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/renderer/java/gin_java_bridge_value_converter.h"
 #include "gin/function_template.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter.h b/content/renderer/java/gin_java_bridge_value_converter.h
index 9053bfa..3ae6a65 100644
--- a/content/renderer/java/gin_java_bridge_value_converter.h
+++ b/content/renderer/java/gin_java_bridge_value_converter.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 
 namespace content {
 
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0dc1a940..61d935c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -27,6 +27,7 @@
 #include "content/child/service_worker/service_worker_network_provider.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_provider_impl.h"
+#include "content/child/v8_value_converter_impl.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/child/web_url_request_util.h"
 #include "content/child/webmessageportchannel_impl.h"
@@ -94,7 +95,6 @@
 #include "content/renderer/renderer_webcolorchooser_impl.h"
 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
 #include "content/renderer/shared_worker_repository.h"
-#include "content/renderer/v8_value_converter_impl.h"
 #include "content/renderer/websharedworker_proxy.h"
 #include "gin/modules/module_registry.h"
 #include "media/base/audio_renderer_mixer_input.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 65c1964..465329f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -37,6 +37,7 @@
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/child/npapi/webplugin_delegate_impl.h"
 #include "content/child/request_extra_data.h"
+#include "content/child/v8_value_converter_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/database_messages.h"
@@ -102,7 +103,6 @@
 #include "content/renderer/stats_collection_controller.h"
 #include "content/renderer/stats_collection_observer.h"
 #include "content/renderer/text_input_client_observer.h"
-#include "content/renderer/v8_value_converter_impl.h"
 #include "content/renderer/web_ui_extension.h"
 #include "content/renderer/web_ui_extension_data.h"
 #include "content/renderer/web_ui_mojo.h"
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc
index dccf88d..9c1cf5c 100644
--- a/content/renderer/skia_benchmarking_extension.cc
+++ b/content/renderer/skia_benchmarking_extension.cc
@@ -9,7 +9,7 @@
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/resources/picture.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/renderer/chrome_object_extensions_utils.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gin/arguments.h"
diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc
index 1279126..9fb77e06 100644
--- a/content/renderer/web_ui_extension.cc
+++ b/content/renderer/web_ui_extension.cc
@@ -7,11 +7,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "content/common/view_messages.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "content/renderer/chrome_object_extensions_utils.h"
 #include "content/renderer/web_ui_extension_data.h"
 #include "gin/arguments.h"
diff --git a/extensions/renderer/DEPS b/extensions/renderer/DEPS
index fcbffb6..fc22611 100644
--- a/extensions/renderer/DEPS
+++ b/extensions/renderer/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+content/public/child",
   "+content/public/renderer",
 
   "+gin",
diff --git a/extensions/renderer/activity_log_converter_strategy.h b/extensions/renderer/activity_log_converter_strategy.h
index 3c732bb..685eb90 100644
--- a/extensions/renderer/activity_log_converter_strategy.h
+++ b/extensions/renderer/activity_log_converter_strategy.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
diff --git a/extensions/renderer/api_activity_logger.cc b/extensions/renderer/api_activity_logger.cc
index c1c5aef..826abb0 100644
--- a/extensions/renderer/api_activity_logger.cc
+++ b/extensions/renderer/api_activity_logger.cc
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "base/bind.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/renderer/activity_log_converter_strategy.h"
 #include "extensions/renderer/api_activity_logger.h"
diff --git a/extensions/renderer/app_window_custom_bindings.cc b/extensions/renderer/app_window_custom_bindings.cc
index b822587..f1a20f5 100644
--- a/extensions/renderer/app_window_custom_bindings.cc
+++ b/extensions/renderer/app_window_custom_bindings.cc
@@ -7,11 +7,11 @@
 #include <string>
 
 #include "base/command_line.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/switches.h"
 #include "extensions/renderer/dispatcher.h"
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index c315711..e4c82f4 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -17,11 +17,11 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/grit/content_resources.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
diff --git a/extensions/renderer/dom_activity_logger.cc b/extensions/renderer/dom_activity_logger.cc
index 213e147..5cebd38 100644
--- a/extensions/renderer/dom_activity_logger.cc
+++ b/extensions/renderer/dom_activity_logger.cc
@@ -4,8 +4,8 @@
 
 #include "extensions/renderer/dom_activity_logger.h"
 
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/dom_action_types.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/renderer/activity_log_converter_strategy.h"
diff --git a/extensions/renderer/event_bindings.cc b/extensions/renderer/event_bindings.cc
index bad6a02..8a005aa 100644
--- a/extensions/renderer/event_bindings.cc
+++ b/extensions/renderer/event_bindings.cc
@@ -14,9 +14,9 @@
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/crx_file/id_util.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/event_filter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
diff --git a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
index 62bbf18..49dae79 100644
--- a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
+++ b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "base/bind.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 52e9283..ada23f9 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -7,9 +7,9 @@
 #include <map>
 #include <set>
 
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc
index 01a2199..452f2e7 100644
--- a/extensions/renderer/messaging_bindings.cc
+++ b/extensions/renderer/messaging_bindings.cc
@@ -13,10 +13,10 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
diff --git a/extensions/renderer/runtime_custom_bindings.cc b/extensions/renderer/runtime_custom_bindings.cc
index a6131e7..fa5b00f 100644
--- a/extensions/renderer/runtime_custom_bindings.cc
+++ b/extensions/renderer/runtime_custom_bindings.cc
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/features/feature.h"
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index de43150..b2c3981 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -9,10 +9,10 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_urls.h"
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index ea588fe..9f3236f 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -10,8 +10,8 @@
 #include "base/metrics/histogram.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/values.h"
+#include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/feature_switch.h"
diff --git a/extensions/renderer/send_request_natives.cc b/extensions/renderer/send_request_natives.cc
index efe5def..d54c727 100644
--- a/extensions/renderer/send_request_natives.cc
+++ b/extensions/renderer/send_request_natives.cc
@@ -5,7 +5,7 @@
 #include "extensions/renderer/send_request_natives.h"
 
 #include "base/json/json_reader.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "extensions/renderer/request_sender.h"
 #include "extensions/renderer/script_context.h"
 
diff --git a/extensions/renderer/test_features_native_handler.cc b/extensions/renderer/test_features_native_handler.cc
index c27575c..0f22855 100644
--- a/extensions/renderer/test_features_native_handler.cc
+++ b/extensions/renderer/test_features_native_handler.cc
@@ -5,7 +5,7 @@
 #include "extensions/renderer/test_features_native_handler.h"
 
 #include "base/bind.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/json_feature_provider_source.h"
 #include "extensions/renderer/script_context.h"
diff --git a/extensions/renderer/v8_schema_registry.cc b/extensions/renderer/v8_schema_registry.cc
index d2d5e0e..841c8cf 100644
--- a/extensions/renderer/v8_schema_registry.cc
+++ b/extensions/renderer/v8_schema_registry.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "content/public/renderer/v8_value_converter.h"
+#include "content/public/child/v8_value_converter.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "extensions/renderer/script_context.h"