Move RenderProcess to content.
TBR=avi
Review URL: http://codereview.chromium.org/6864001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81681 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index fb1b699..951b5f7 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -58,7 +58,6 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/safe_browsing/safebrowsing_messages.h"
#include "chrome/common/spellcheck_messages.h"
-#include "chrome/renderer/render_process_impl.h"
#include "content/browser/appcache/appcache_dispatcher_host.h"
#include "content/browser/browser_child_process_host.h"
#include "content/browser/child_process_security_policy.h"
@@ -99,6 +98,7 @@
#include "content/common/resource_messages.h"
#include "content/common/result_codes.h"
#include "content/common/view_messages.h"
+#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread.h"
#include "grit/generated_resources.h"
#include "ipc/ipc_logging.h"
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 863b271..aa3adc2 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -120,9 +120,6 @@
'renderer/print_web_view_helper_linux.cc',
'renderer/print_web_view_helper_mac.mm',
'renderer/print_web_view_helper_win.cc',
- 'renderer/render_process.h',
- 'renderer/render_process_impl.cc',
- 'renderer/render_process_impl.h',
'renderer/renderer_glue.cc',
'renderer/renderer_histogram_snapshots.cc',
'renderer/renderer_histogram_snapshots.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 034ae4d..23158f8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1824,7 +1824,6 @@
'renderer/extensions/json_schema_unittest.cc',
'renderer/net/predictor_queue_unittest.cc',
'renderer/net/renderer_predictor_unittest.cc',
- 'renderer/render_process_unittest.cc',
'renderer/renderer_about_handler_unittest.cc',
'renderer/renderer_main_unittest.cc',
'renderer/safe_browsing/features_unittest.cc',
@@ -1913,6 +1912,7 @@
'../content/renderer/media/audio_renderer_impl_unittest.cc',
'../content/renderer/p2p/p2p_transport_impl_unittest.cc',
'../content/renderer/paint_aggregator_unittest.cc',
+ '../content/renderer/render_process_unittest.cc',
'../content/renderer/render_widget_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/DEPS b/chrome/renderer/DEPS
index f928926..f1fd26d 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -21,6 +21,5 @@
"+third_party/mach_override",
"+third_party/npapi/bindings",
"+third_party/sqlite",
- "+third_party/tcmalloc",
]
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index e874e52..ba88fa3 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -4,6 +4,7 @@
#include "chrome/renderer/autofill/autofill_agent.h"
+#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/autofill_messages.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index d677e5f9b..e523d39 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/command_line.h"
+#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/values.h"
#include "chrome/common/child_process_logging.h"
diff --git a/chrome/renderer/chrome_render_observer.cc b/chrome/renderer/chrome_render_observer.cc
index ef89792..3f4ff6b 100644
--- a/chrome/renderer/chrome_render_observer.cc
+++ b/chrome/renderer/chrome_render_observer.cc
@@ -5,6 +5,7 @@
#include "chrome/renderer/chrome_render_observer.h"
#include "base/command_line.h"
+#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h"
@@ -15,6 +16,7 @@
#include "content/renderer/render_view.h"
#include "skia/ext/bitmap_platform_device.h"
#include "skia/ext/image_operations.h"
+#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 11b8fd8..ba27dba 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -7,6 +7,7 @@
#include <map>
#include "base/command_line.h"
+#include "base/message_loop.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/devtools_messages.h"
#include "chrome/renderer/devtools_agent_filter.h"
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index 46b1a8f..32f101a 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -5,6 +5,7 @@
#include "chrome/renderer/devtools_client.h"
#include "base/command_line.h"
+#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/devtools_messages.h"
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index 7361d392..db26ed7 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/lazy_instance.h"
+#include "base/message_loop.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/renderer/mock_render_process.h b/chrome/renderer/mock_render_process.h
index 1939b2b..9ee7127b 100644
--- a/chrome/renderer/mock_render_process.h
+++ b/chrome/renderer/mock_render_process.h
@@ -6,7 +6,7 @@
#define CHROME_RENDERER_MOCK_RENDER_PROCESS_H_
#pragma once
-#include "chrome/renderer/render_process.h"
+#include "content/renderer/render_process.h"
// This class is a mock of the child process singleton which we use during
// running of the RenderView unit tests.
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 47e2304a..67a53e7 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -20,7 +20,6 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
-#include "chrome/renderer/render_process.h"
#include "content/common/clipboard_messages.h"
#include "content/common/socket_stream_dispatcher.h"
#include "content/common/view_messages.h"
diff --git a/chrome/renderer/renderer_histogram_snapshots.cc b/chrome/renderer/renderer_histogram_snapshots.cc
index 3eed2d2..feb9d64 100644
--- a/chrome/renderer/renderer_histogram_snapshots.cc
+++ b/chrome/renderer/renderer_histogram_snapshots.cc
@@ -10,7 +10,6 @@
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_process.h"
#include "content/renderer/render_thread.h"
// TODO(raman): Before renderer shuts down send final snapshot lists.
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index 8d4e51c..2066dc8e0 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -28,9 +28,9 @@
#include "chrome/common/net/net_resource_provider.h"
#include "chrome/common/pepper_plugin_registry.h"
#include "chrome/renderer/renderer_main_platform_delegate.h"
-#include "chrome/renderer/render_process_impl.h"
#include "content/common/main_function_params.h"
#include "content/common/hi_res_timer_manager.h"
+#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread.h"
#include "grit/generated_resources.h"
#include "net/base/net_module.h"
diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc
index 4d4fed1..e19c85a 100644
--- a/chrome/renderer/translate_helper.cc
+++ b/chrome/renderer/translate_helper.cc
@@ -5,6 +5,7 @@
#include "chrome/renderer/translate_helper.h"
#include "base/compiler_specific.h"
+#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_constants.h"
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 44a84ff..b29dc1f 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -85,6 +85,9 @@
'renderer/pepper_plugin_delegate_impl.h',
'renderer/plugin_channel_host.cc',
'renderer/plugin_channel_host.h',
+ 'renderer/render_process.h',
+ 'renderer/render_process_impl.cc',
+ 'renderer/render_process_impl.h',
'renderer/render_process_observer.cc',
'renderer/render_process_observer.h',
'renderer/render_thread.cc',
diff --git a/chrome/renderer/render_process.h b/content/renderer/render_process.h
similarity index 93%
rename from chrome/renderer/render_process.h
rename to content/renderer/render_process.h
index 5cc79999..2fb2a61 100644
--- a/chrome/renderer/render_process.h
+++ b/content/renderer/render_process.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_RENDER_PROCESS_H_
-#define CHROME_RENDERER_RENDER_PROCESS_H_
+#ifndef CONTENT_RENDERER_RENDER_PROCESS_H_
+#define CONTENT_RENDERER_RENDER_PROCESS_H_
#pragma once
#include "content/common/child_process.h"
@@ -61,4 +61,4 @@
DISALLOW_COPY_AND_ASSIGN(RenderProcess);
};
-#endif // CHROME_RENDERER_RENDER_PROCESS_H_
+#endif // CONTENT_RENDERER_RENDER_PROCESS_H_
diff --git a/chrome/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
similarity index 99%
rename from chrome/renderer/render_process_impl.cc
rename to content/renderer/render_process_impl.cc
index deb67b1..53d01cc07 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -10,7 +10,7 @@
#include <mlang.h>
#endif
-#include "chrome/renderer/render_process_impl.h"
+#include "content/renderer/render_process_impl.h"
#include "base/basictypes.h"
#include "base/command_line.h"
diff --git a/chrome/renderer/render_process_impl.h b/content/renderer/render_process_impl.h
similarity index 92%
rename from chrome/renderer/render_process_impl.h
rename to content/renderer/render_process_impl.h
index be530053..b530e6ae 100644
--- a/chrome/renderer/render_process_impl.h
+++ b/content/renderer/render_process_impl.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_RENDER_PROCESS_IMPL_H_
-#define CHROME_RENDERER_RENDER_PROCESS_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_
+#define CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_
#pragma once
#include "base/timer.h"
-#include "chrome/renderer/render_process.h"
+#include "content/renderer/render_process.h"
#include "native_client/src/shared/imc/nacl_imc.h"
namespace skia {
@@ -73,4 +73,4 @@
DISALLOW_COPY_AND_ASSIGN(RenderProcessImpl);
};
-#endif // CHROME_RENDERER_RENDER_PROCESS_IMPL_H_
+#endif // CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_
diff --git a/chrome/renderer/render_process_unittest.cc b/content/renderer/render_process_unittest.cc
similarity index 96%
rename from chrome/renderer/render_process_unittest.cc
rename to content/renderer/render_process_unittest.cc
index 9e9a065..1f5cd599 100644
--- a/chrome/renderer/render_process_unittest.cc
+++ b/content/renderer/render_process_unittest.cc
@@ -4,7 +4,7 @@
#include "base/sys_info.h"
#include "base/string_util.h"
-#include "chrome/renderer/render_process_impl.h"
+#include "content/renderer/render_process_impl.h"
#include "ipc/ipc_channel.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/rect.h"
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 794f1e2..697633d 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -27,7 +27,6 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/safe_browsing/safebrowsing_messages.h"
#include "chrome/common/url_constants.h"
-#include "chrome/renderer/render_process_impl.h"
#include "content/common/appcache/appcache_dispatcher.h"
#include "content/common/database_messages.h"
#include "content/common/db_message_filter.h"
@@ -45,6 +44,7 @@
#include "content/renderer/gpu_video_service_host.h"
#include "content/renderer/indexed_db_dispatcher.h"
#include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_process_observer.h"
#include "content/renderer/render_view.h"
#include "content/renderer/render_view_visitor.h"
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 8adbd10..9777b2d 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -38,7 +38,6 @@
#include "chrome/renderer/automation/dom_automation_controller.h"
#include "chrome/renderer/external_host_bindings.h"
#include "chrome/renderer/localized_error.h"
-#include "chrome/renderer/render_process.h"
#include "chrome/renderer/searchbox.h"
#include "chrome/renderer/visitedlink_slave.h"
#include "content/common/appcache/appcache_dispatcher.h"
@@ -65,6 +64,7 @@
#include "content/renderer/notification_provider.h"
#include "content/renderer/p2p/socket_dispatcher.h"
#include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/render_process.h"
#include "content/renderer/render_thread.h"
#include "content/renderer/render_view_observer.h"
#include "content/renderer/render_view_visitor.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 2ebb16e..2e0ad0a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -12,8 +12,8 @@
#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_process.h"
#include "content/common/view_messages.h"
+#include "content/renderer/render_process.h"
#include "content/renderer/render_thread.h"
#include "content/renderer/renderer_webkitclient_impl.h"
#include "gpu/common/gpu_trace_event.h"
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index a3ce7b0..b6cf16e 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -10,7 +10,8 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "chrome/renderer/render_process.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/time.h"
#include "content/renderer/paint_aggregator.h"
#include "ipc/ipc_channel.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 07f3cae..bcf32d0 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -22,6 +22,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/render_messages.h"
+#include "content/common/child_process.h"
#include "content/common/plugin_messages.h"
#include "content/common/view_messages.h"
#include "content/plugin/npobject_proxy.h"
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 2184e3b3..a3eaf56b 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/callback.h"
+#include "base/message_loop_proxy.h"
#include "base/memory/ref_counted.h"
#include "base/platform_file.h"
#include "base/shared_memory.h"
