Finish removing url_constants from content/.

BUG=76697
TEST=compiles

Review URL: http://codereview.chromium.org/7049010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86469 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 19 insertions, 126 deletions

diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index 4c442cf..360fab2 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -2,62 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "content/browser/renderer_host/render_process_host_browsertest.h"
+
 #include "base/command_line.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/url_constants.h"
-#include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_process_host.h"
-#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/render_widget_host.h"
-#include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/test_url_constants.h"
 
-class RenderProcessHostTest : public InProcessBrowserTest {
- public:
-  RenderProcessHostTest() {
-    EnableDOMAutomation();
-  }
-
-  int RenderProcessHostCount() {
-    RenderProcessHost::iterator hosts = RenderProcessHost::AllHostsIterator();
-    int count = 0;
-    while (!hosts.IsAtEnd()) {
-      if (hosts.GetCurrentValue()->HasConnection())
-        count++;
-      hosts.Advance();
-    }
-    return count;
-  }
+RenderProcessHostTest::RenderProcessHostTest() {
+  EnableDOMAutomation();
+}
 
-  RenderViewHost* FindFirstDevToolsHost() {
-    RenderProcessHost::iterator hosts = RenderProcessHost::AllHostsIterator();
-    for (; !hosts.IsAtEnd(); hosts.Advance()) {
-      RenderProcessHost* render_process_host = hosts.GetCurrentValue();
-      DCHECK(render_process_host);
-      if (!render_process_host->HasConnection())
-        continue;
-      RenderProcessHost::listeners_iterator iter(
-          render_process_host->ListenersIterator());
-      for (; !iter.IsAtEnd(); iter.Advance()) {
-        const RenderWidgetHost* widget =
-            static_cast<const RenderWidgetHost*>(iter.GetCurrentValue());
-        DCHECK(widget);
-        if (!widget || !widget->IsRenderView())
-          continue;
-        RenderViewHost* host = const_cast<RenderViewHost*>(
-            static_cast<const RenderViewHost*>(widget));
-        RenderViewHostDelegate* host_delegate = host->delegate();
-        GURL url = host_delegate->GetURL();
-        if (url.SchemeIs(chrome::kChromeDevToolsScheme))
-          return host;
-      }
-    }
-    return NULL;
+int RenderProcessHostTest::RenderProcessHostCount() {
+  RenderProcessHost::iterator hosts = RenderProcessHost::AllHostsIterator();
+  int count = 0;
+  while (!hosts.IsAtEnd()) {
+    if (hosts.GetCurrentValue()->HasConnection())
+      count++;
+    hosts.Advance();
   }
-};
+  return count;
+}
 
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
   // Set max renderers to 1 to force running out of processes.
@@ -74,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
 #endif
 
   // Change the first tab to be the new tab page (TYPE_WEBUI).
-  GURL newtab(chrome::kChromeUINewTabURL);
+  GURL newtab(chrome::kTestNewTabURL);
   ui_test_utils::NavigateToURL(browser(), newtab);
   EXPECT_EQ(tab_count, browser()->tab_count());
   EXPECT_EQ(host_count, RenderProcessHostCount());
@@ -115,81 +83,6 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
   EXPECT_EQ(host_count, RenderProcessHostCount());
 }
 
-// Ensure that DevTools opened to debug DevTools is launched in a separate
-// process when --process-per-tab is set. See crbug.com/69873.
-IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DevToolsOnSelfInOwnProcessPPT) {
-  CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  parsed_command_line.AppendSwitch(switches::kProcessPerTab);
-
-  int tab_count = 1;
-  int host_count = 1;
-
-#if defined(TOUCH_UI)
-  ++host_count;  // For the touch keyboard.
-#endif
-
-  GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1);
-  if (browser()->tab_count() == tab_count)
-    ui_test_utils::WaitForNewTab(browser());
-  tab_count++;
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-
-  // DevTools start in docked mode (no new tab), in a separate process.
-  browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT);
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-
-  RenderViewHost* devtools = FindFirstDevToolsHost();
-  DCHECK(devtools);
-
-  // DevTools start in a separate process.
-  DevToolsManager::GetInstance()->ToggleDevToolsWindow(
-      devtools, DEVTOOLS_TOGGLE_ACTION_INSPECT);
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-}
-
-// Ensure that DevTools opened to debug DevTools is launched in a separate
-// process. See crbug.com/69873.
-IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DevToolsOnSelfInOwnProcess) {
-  int tab_count = 1;
-  int host_count = 1;
-
-#if defined(TOUCH_UI)
-  ++host_count;  // For the touch keyboard.
-#endif
-
-  GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1);
-  if (browser()->tab_count() == tab_count)
-    ui_test_utils::WaitForNewTab(browser());
-  tab_count++;
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-
-  // DevTools start in docked mode (no new tab), in a separate process.
-  browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT);
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-
-  RenderViewHost* devtools = FindFirstDevToolsHost();
-  DCHECK(devtools);
-
-  // DevTools start in a separate process.
-  DevToolsManager::GetInstance()->ToggleDevToolsWindow(
-      devtools, DEVTOOLS_TOGGLE_ACTION_INSPECT);
-  host_count++;
-  EXPECT_EQ(tab_count, browser()->tab_count());
-  EXPECT_EQ(host_count, RenderProcessHostCount());
-}
-
 // When we hit the max number of renderers, verify that the way we do process
 // sharing behaves correctly.  In particular, this test is verifying that even
 // when we hit the max process limit, that renderers of each type will wind up
@@ -211,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
 #endif
 
   // Change the first tab to be the new tab page (TYPE_WEBUI).
-  GURL newtab(chrome::kChromeUINewTabURL);
+  GURL newtab(chrome::kTestNewTabURL);
   ui_test_utils::NavigateToURL(browser(), newtab);
   EXPECT_EQ(tab_count, browser()->tab_count());
   tab1 = browser()->GetTabContentsAt(tab_count - 1);
@@ -249,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
   // Note: intentionally create this tab after the TYPE_TABBED tabs to exercise
   // bug 43448 where extension and WebUI tabs could get combined into normal
   // renderers.
-  GURL history(chrome::kChromeUIHistoryURL);
+  GURL history(chrome::kTestHistoryURL);
   browser()->ShowSingletonTab(history);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
@@ -262,7 +155,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
 
   // Create a TYPE_EXTENSION tab.  It should be in its own process.
   // (the bookmark manager is implemented as an extension)
-  GURL bookmarks(chrome::kChromeUIBookmarksURL);
+  GURL bookmarks(chrome::kTestBookmarksURL);
   browser()->ShowSingletonTab(bookmarks);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());