InstantExtended: Send search URLs to renderers.

chrome/browser/chrome_content_browser_client_browsertest.cc

 // Copyright (c) 2012 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 "base/metrics/field_trial.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 76 matching lines @@
   const GURL url("chrome://chrome//foo");
 
   ui_test_utils::NavigateToURL(browser(), url);
   NavigationEntry* entry = GetLastCommittedEntry();
 
   ASSERT_TRUE(entry != NULL);
   EXPECT_TRUE(entry->GetVirtualURL().is_valid());
   EXPECT_EQ(url, entry->GetVirtualURL());
 }
 
-IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
+class InstantNTPURLRewriteTest : public ChromeContentBrowserClientBrowserTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    // browsertest initially spins up a non-Instant renderer for about:blank.
+    // In a real browser, navigating this renderer to the Instant new tab page
+    // forks a new privileged Instant render process, but that warps
+    // browsertest's fragile little mind; it just never navigates. We aren't
+    // trying to test the process model here, so turn it off.
+    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSingleProcess);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(InstantNTPURLRewriteTest,
                        UberURLHandler_InstantExtendedNewTabPage) {
   const GURL url_original("chrome://newtab");
   const GURL url_rewritten("http://example.com/newtab");
   InstallTemplateURLWithNewTabPage(url_rewritten);
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
       "Group1 use_cacheable_ntp:1"));
   chrome::EnableInstantExtendedAPIForTesting();
 
   ui_test_utils::NavigateToURL(browser(), url_original);
   NavigationEntry* entry = GetLastCommittedEntry();
 
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(url_rewritten, entry->GetURL());
   EXPECT_EQ(url_original, entry->GetVirtualURL());
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
                        UberURLHandler_InstantExtendedNewTabPageDisabled) {
+  // Don't do the kSingleProcess shenanigans here (see the dual test) because
+  // otherwise RenderViewImpl crashes in a paranoid fit on startup.
   const GURL url_original("chrome://newtab");
   const GURL url_rewritten("http://example.com/newtab");
   InstallTemplateURLWithNewTabPage(url_rewritten);
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
       "Group1 use_cacheable_ntp:1"));
   chrome::DisableInstantExtendedAPIForTesting();
 
   ui_test_utils::NavigateToURL(browser(), url_original);
   NavigationEntry* entry = GetLastCommittedEntry();
 
@@ skipping 14 matching lines @@
 
   ui_test_utils::NavigateToURL(browser(), url);
   NavigationEntry* entry = GetLastCommittedEntry();
 
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(url, entry->GetURL());
   EXPECT_EQ(url, entry->GetVirtualURL());
 }
 
 }  // namespace content