Fix a browser test for touchui: Count the renderer for the keyboard and update expectations.

content/browser/renderer_host/render_process_host_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 52 matching lines @@
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
   // Set max renderers to 1 to force running out of processes.
   RenderProcessHost::SetMaxRendererProcessCount(1);
 
   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
+
   // Change the first tab to be the new tab page (TYPE_WEBUI).
   GURL newtab(chrome::kChromeUINewTabURL);
   ui_test_utils::NavigateToURL(browser(), newtab);
   EXPECT_EQ(tab_count, browser()->tab_count());
   EXPECT_EQ(host_count, RenderProcessHostCount());
 
   // Create a new TYPE_TABBED tab.  It should be in its own process.
   GURL page1("data:text/html,hello world1");
   browser()->ShowSingletonTab(page1);
   if (browser()->tab_count() == tab_count)
@@ skipping 31 matching lines @@
 
 // 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.
@@ skipping 12 matching lines @@
   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.
@@ skipping 22 matching lines @@
   RenderProcessHost::SetMaxRendererProcessCount(1);
 
   int tab_count = 1;
   int host_count = 1;
   TabContents* tab1 = NULL;
   TabContents* tab2 = NULL;
   RenderProcessHost* rph1 = NULL;
   RenderProcessHost* rph2 = NULL;
   RenderProcessHost* rph3 = NULL;
 
+#if defined(TOUCH_UI)
+  ++host_count;  // For the touch keyboard.
+#endif
+
   // Change the first tab to be the new tab page (TYPE_WEBUI).
   GURL newtab(chrome::kChromeUINewTabURL);
   ui_test_utils::NavigateToURL(browser(), newtab);
   EXPECT_EQ(tab_count, browser()->tab_count());
   tab1 = browser()->GetTabContentsAt(tab_count - 1);
   rph1 = tab1->GetRenderProcessHost();
   EXPECT_EQ(tab1->GetURL(), newtab);
   EXPECT_EQ(host_count, RenderProcessHostCount());
 
   // Create a new TYPE_TABBED tab.  It should be in its own process.
@@ skipping 37 matching lines @@
   EXPECT_EQ(host_count, RenderProcessHostCount());
   EXPECT_EQ(tab2->GetRenderProcessHost(), rph1);
 
   // 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);
   if (browser()->tab_count() == tab_count)
     ui_test_utils::WaitForNewTab(browser());
   tab_count++;
+#if !defined(TOUCH_UI)
+  // The keyboard in touchui already creates an extension process. So this
+  // should not increase the process count.
   host_count++;
+#endif
   EXPECT_EQ(tab_count, browser()->tab_count());
   tab1 = browser()->GetTabContentsAt(tab_count - 1);
   rph3 = tab1->GetRenderProcessHost();
   EXPECT_EQ(tab1->GetURL(), bookmarks);
   EXPECT_EQ(host_count, RenderProcessHostCount());
   EXPECT_NE(rph1, rph3);
   EXPECT_NE(rph2, rph3);
 }