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..347a1e5028eb4675d5ae1f0e7770ee5034e1a55b 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;

[sreeram, 2013/05/03 23:17:31]

This bypasses the secure & espv checks. I understand your argument that "if
IsCommandLineInstantURL, it must be IsInstantURL!". But that's not what this is
exactly meant to be. The --instant-url is meant to be a very light-weight way to
change the template's instant URL. In particular, I want it to go through as
many of the same checks we apply to the regular template URL.

In fact, by leaving the code as is (without your change), you are now forced to
test the 404/204 case properly. I.e., bring up a google.com server that actually
serves a 204 on the expected /search or /webhp path. Because, that's what users
will actually experience. By allowing this shortcut, you can "get away" with
testing --instant-url="file://foo/bar", which doesn't really show that this
would work for the normal user case.

[David Black, 2013/05/04 00:49:23]

As discussed in person, I maintain the logic here as-is is extremely confusing,
but reverted back to what it was since it's not critical for this CL.

 
   if (!effective_url.is_valid())
     return false;
@@ -479,11 +478,12 @@ 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::kDisableLocalFirstLoadNTP)) {
     return false;
   }
+  if (command_line->HasSwitch(switches::kEnableLocalFirstLoadNTP))
+    return true;

[sreeram, 2013/05/03 23:17:31]

This is inverted. kEnableLocalFirstLoadNTP should "return false" and
kDisableLocalFirstLoadNTP should "return true".

[David Black, 2013/05/04 00:49:23]

Whoops.  Fixed.

 
   FieldTrialFlags flags;
   if (GetFieldTrialInfo(