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

chrome/browser/search/search.cc

 // Copyright 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 "chrome/browser/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 142 matching lines @@
 bool IsInstantURL(const GURL& url, Profile* profile) {
   TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
   if (!template_url)
     return false;
 
   const TemplateURLRef& instant_url_ref = template_url->instant_url_ref();
   const bool extended_api_enabled = IsInstantExtendedAPIEnabled();
   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;
 
   if (extended_api_enabled && !effective_url.SchemeIsSecure())
     return false;
 
   if (extended_api_enabled &&
       !template_url->HasSearchTermsReplacementKey(effective_url))
     return false;
@@ skipping 297 matching lines @@
 
 bool IsInstantEnabled(Profile* profile) {
   return GetInstantURL(profile, kDisableStartMargin).is_valid();
 }
 
 bool ShouldPreferRemoteNTPOnStartup() {
   // Check the command-line/about:flags setting first, which should have
   // 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;
   }
 
   FieldTrialFlags flags;
   if (GetFieldTrialInfo(
           base::FieldTrialList::FindFullName(kInstantExtendedFieldTrialName),
           &flags, NULL)) {
     return GetBoolValueForFlagWithDefault(kUseRemoteNTPOnStartupFlagName, false,
                                           flags);
   }
@@ skipping 107 matching lines @@
 
   GURL instant_url = TemplateURLRefToGURL(template_url->instant_url_ref(),
                                           kDisableStartMargin);
   // Extended mode instant requires a search terms replacement key.
   return instant_url.is_valid() &&
          (!IsInstantExtendedAPIEnabled() ||
           template_url->HasSearchTermsReplacementKey(instant_url));
 }
 
 }  // namespace chrome