Fall back to local page if online NTP fails to load.

chrome/browser/search/search.cc

Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 12bc7c6f7a783154d8280f0a295c2701b45d7155..d77875a3a45b654637bd13b28d16a6cb2a8157d8 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -160,8 +160,7 @@ bool IsInstantURL(const GURL& url, Profile* profile) {
   GURL effective_url = url;
 
   if (IsCommandLineInstantURL(url))
-    effective_url = CoerceCommandLineURLToTemplateURL(url, instant_url_ref,
-                                                      kDisableStartMargin);
+    return true;

[samarth, 2013/05/02 21:57:18]

Test for this change too please.

[David Black, 2013/05/02 23:30:01]

Done.

 
   if (!effective_url.is_valid())
     return false;
@@ -479,9 +478,7 @@ bool ShouldPreferRemoteNTPOnStartup() {
   // precedence and allows the trial to not be reported (if it's never queried).
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableInstantExtendedAPI) ||
-      command_line->HasSwitch(switches::kEnableInstantExtendedAPI) ||
-      command_line->HasSwitch(switches::kEnableLocalOnlyInstantExtendedAPI) ||
-      command_line->HasSwitch(switches::kDisableLocalOnlyInstantExtendedAPI)) {
+      command_line->HasSwitch(switches::kEnableLocalOnlyInstantExtendedAPI)) {
     return false;
   }