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

content/browser/renderer_host/render_process_host_browsertest.cc

Index: content/browser/renderer_host/render_process_host_browsertest.cc
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index b4c6a5888946bbccd34cb90f1b6916a97b0a55af..ec093c6ccad366c583523636bf9b2cde13fb5ff8 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -70,6 +70,10 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
   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);
@@ -121,6 +125,10 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, DevToolsOnSelfInOwnProcessPPT) {
   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)
@@ -153,6 +161,10 @@ 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)
@@ -195,6 +207,10 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
   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);
@@ -252,7 +268,11 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
   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();