Update defaults for InstantExtended.

chrome/browser/chrome_content_browser_client_browsertest.cc

Index: chrome/browser/chrome_content_browser_client_browsertest.cc
diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc
index 3bb56a5209f5c0f5ae9cd1b979fdb1a98327ca77..3dc39befc3566c55a314f2f50dabab8653b79fb9 100644
--- a/chrome/browser/chrome_content_browser_client_browsertest.cc
+++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -113,7 +112,6 @@ IN_PROC_BROWSER_TEST_F(InstantNTPURLRewriteTest,
   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();
@@ -123,25 +121,6 @@ IN_PROC_BROWSER_TEST_F(InstantNTPURLRewriteTest,
   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();
-
-  ASSERT_TRUE(entry != NULL);
-  EXPECT_EQ(url_original, entry->GetURL());
-  EXPECT_EQ(url_original, entry->GetVirtualURL());
-}
-
 // Test that a basic navigation works in --site-per-process mode.  This prevents
 // regressions when that mode calls out into the ChromeContentBrowserClient,
 // such as http://crbug.com/164223.