| Index: content/browser/renderer_host/render_process_host_browsertest.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_process_host_browsertest.cc (revision 110571)
|
| +++ content/browser/renderer_host/render_process_host_browsertest.cc (working copy)
|
| @@ -7,7 +7,7 @@
|
| #include "base/command_line.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| -#include "content/browser/renderer_host/render_process_host.h"
|
| +#include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/common/test_url_constants.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -17,7 +17,8 @@
|
| }
|
|
|
| int RenderProcessHostTest::RenderProcessHostCount() {
|
| - RenderProcessHost::iterator hosts = RenderProcessHost::AllHostsIterator();
|
| + content::RenderProcessHost::iterator hosts =
|
| + content::RenderProcessHost::AllHostsIterator();
|
| int count = 0;
|
| while (!hosts.IsAtEnd()) {
|
| if (hosts.GetCurrentValue()->HasConnection())
|
| @@ -29,7 +30,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
|
| // Set max renderers to 1 to force running out of processes.
|
| - RenderProcessHost::SetMaxRendererProcessCountForTest(1);
|
| + content::RenderProcessHost::SetMaxRendererProcessCountForTest(1);
|
|
|
| CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
|
| parsed_command_line.AppendSwitch(switches::kProcessPerTab);
|
| @@ -89,15 +90,15 @@
|
| // in a process of that type, even if that means creating a new process.
|
| IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
|
| // Set max renderers to 1 to force running out of processes.
|
| - RenderProcessHost::SetMaxRendererProcessCountForTest(1);
|
| + content::RenderProcessHost::SetMaxRendererProcessCountForTest(1);
|
|
|
| int tab_count = 1;
|
| int host_count = 1;
|
| TabContents* tab1 = NULL;
|
| TabContents* tab2 = NULL;
|
| - RenderProcessHost* rph1 = NULL;
|
| - RenderProcessHost* rph2 = NULL;
|
| - RenderProcessHost* rph3 = NULL;
|
| + content::RenderProcessHost* rph1 = NULL;
|
| + content::RenderProcessHost* rph2 = NULL;
|
| + content::RenderProcessHost* rph3 = NULL;
|
|
|
| #if defined(TOUCH_UI)
|
| ++host_count; // For the touch keyboard.
|
|
|