retry r76329 with chromeos fix

Change the behavior of ignore_path in BrowserNavigator.

use an enum instead. The enum controls whether to replace the path or leave it alone when bringing an already-open tab to the front.

BUG=71472
TEST=included

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

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

1 files changed, 8 insertions, 8 deletions

diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index afe829c..62c05b5 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
 
   // Create a new TYPE_NORMAL tab.  It should be in its own process.
   GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1, false);
+  browser()->ShowSingletonTab(page1);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -88,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
 
   // Create another TYPE_NORMAL tab.  It should share the previous process.
   GURL page2("data:text/html,hello world2");
-  browser()->ShowSingletonTab(page2, false);
+  browser()->ShowSingletonTab(page2);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DevToolsOnSelfInOwnProcessPPT) {
   int host_count = 1;
 
   GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1, false);
+  browser()->ShowSingletonTab(page1);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DevToolsOnSelfInOwnProcess) {
   int host_count = 1;
 
   GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1, false);
+  browser()->ShowSingletonTab(page1);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -206,7 +206,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
 
   // Create a new TYPE_NORMAL tab.  It should be in its own process.
   GURL page1("data:text/html,hello world1");
-  browser()->ShowSingletonTab(page1, false);
+  browser()->ShowSingletonTab(page1);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -220,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
 
   // Create another TYPE_NORMAL tab.  It should share the previous process.
   GURL page2("data:text/html,hello world2");
-  browser()->ShowSingletonTab(page2, false);
+  browser()->ShowSingletonTab(page2);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
   // bug 43448 where extension and WebUI tabs could get combined into normal
   // renderers.
   GURL history(chrome::kChromeUIHistoryURL);
-  browser()->ShowSingletonTab(history, false);
+  browser()->ShowSingletonTab(history);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
@@ -248,7 +248,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);
-  browser()->ShowSingletonTab(bookmarks, false);
+  browser()->ShowSingletonTab(bookmarks);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;