diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 00:34:30 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 00:34:30 +0000 |
commit | f3b1a084a01ab82caf998daefcb989c66ff16135 (patch) | |
tree | 1072e46976c2fb7fa82d72c74bdc579d78f0ce01 /chrome/test/base/in_process_browser_test.cc | |
parent | 8f0633691cd10779408642e2ad5eaa9b0c190b0a (diff) | |
download | chromium_src-f3b1a084a01ab82caf998daefcb989c66ff16135.zip chromium_src-f3b1a084a01ab82caf998daefcb989c66ff16135.tar.gz chromium_src-f3b1a084a01ab82caf998daefcb989c66ff16135.tar.bz2 |
Define the public interface for content browser RenderProcessHost. This interface is implemented by the RenderProcessHostImpl class which lives in content\browser\renderer_host\render_process_host_impl.cc/.h. The RenderProcessHostImpl class is a consolidation of the RenderProcessHost and BrowserRenderProcessHost classes.
The RenderProcessHost public interface was created from the now deleted RenderProcessHost class defined in content\browser\renderer_host\render_process_host.h.
Additional methods have been added to the interface to ensure that it works correctly with the MockRenderProcessHost class used by unit tests. I had to implement a number of overrides in the MockRenderProcessHost class to ensure that tests work correctly. This was because of assumptions in the tests that the MockRPH class was a real RPH which it was till now.
Added a TODO for the methods which could potentially be removed from this interface. Will revisit that in a subsequent CL.
BUG=98716
TEST=No change in functionality. Hopefully it all compiles and works.
Review URL: http://codereview.chromium.org/8515027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/in_process_browser_test.cc')
-rw-r--r-- | chrome/test/base/in_process_browser_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 02a2d7a..b26c80b 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -29,10 +29,10 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_process_host.h" #include "content/renderer/mock_content_renderer_client.h" #include "content/test/test_browser_thread.h" #include "net/base/mock_host_resolver.h" @@ -106,7 +106,7 @@ void InProcessBrowserTest::SetUp() { // Single-process mode is not set in BrowserMain, so process it explicitly, // and set up renderer. if (command_line->HasSwitch(switches::kSingleProcess)) { - RenderProcessHost::set_run_renderer_in_process(true); + content::RenderProcessHost::set_run_renderer_in_process(true); single_process_renderer_client_.reset( new content::MockContentRendererClient); content::GetContentClient()->set_renderer( |