Instant: Don't use the local overlay's URL for the NTP.

chrome/browser/ui/search/instant_controller.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/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1412 matching lines @@
   DCHECK_LE(0, intersection.x());
   DCHECK_LE(0, intersection.width());
   DCHECK_LE(0, intersection.height());
 
   overlay_->SetPopupBounds(intersection);
 }
 
 bool InstantController::GetInstantURL(Profile* profile,
                                       bool ignore_blacklist,
                                       std::string* instant_url) const {
-  DCHECK(profile);
-  instant_url->clear();
-
-  if (extended_enabled_ && use_local_overlay_only_) {
-    *instant_url = chrome::kChromeSearchLocalOmniboxPopupURL;
-    return true;
-  }
+  if (extended_enabled_ && use_local_overlay_only_)
+    return false;
 
   const GURL instant_url_obj = chrome::GetInstantURL(profile,
                                                      omnibox_bounds_.x());
   if (!instant_url_obj.is_valid())
     return false;
 
   *instant_url = instant_url_obj.spec();
 
   if (!ignore_blacklist) {
     std::map<std::string, int>::const_iterator iter =
@@ skipping 172 matching lines @@
 
   // If this is not window startup, switch.
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   if (browser_->GetActiveWebContents())
     return true;
 
   return chrome::IsAggressiveLocalNTPFallbackEnabled();
 }