appcache ntp: Fallback to local, don't prerender.

GoogleBaseURL starts out as http and is only upgraded to https after
search domain check, so we'll try to load http://<newtabpage> and fail.
The failed load either 404s or shows the local new tab page, depending
on when the search domain check finishes. Instead, if the new tab url
isn't secure, prefer the the baked-in new tab page.

Also fall back to the local ntp if the user has no search
provider, if the user's search provider has no custom ntp,
or if the user disables search suggestions.

Also, don't prerender the old instant ntp anymore.

TEST=manual,unit
BUG=304184,304901,304397

Review URL: https://codereview.chromium.org/26024002

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

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc
index 3bb56a5..6dbd60c 100644
--- a/chrome/browser/chrome_content_browser_client_browsertest.cc
+++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
@@ -109,7 +109,7 @@ class InstantNTPURLRewriteTest : public ChromeContentBrowserClientBrowserTest {
 IN_PROC_BROWSER_TEST_F(InstantNTPURLRewriteTest,
                        UberURLHandler_InstantExtendedNewTabPage) {
   const GURL url_original("chrome://newtab");
-  const GURL url_rewritten("http://example.com/newtab");
+  const GURL url_rewritten("https://example.com/newtab");
   InstallTemplateURLWithNewTabPage(url_rewritten);
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
       "Group1 use_cacheable_ntp:1"));
@@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
   // 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");
+  const GURL url_rewritten("https://example.com/newtab");
   InstallTemplateURLWithNewTabPage(url_rewritten);
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
       "Group1 use_cacheable_ntp:1"));