Instant: Use Local NTP in non-incognito whenever possible.

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 465 matching lines @@
       content::NotificationService::NoDetails());
 
   // We don't have new suggestions yet, but we can either reuse the existing
   // suggestion or reset the existing "gray text".
   browser_->SetInstantSuggestion(last_suggestion_);
 
   return true;
 }
 
 scoped_ptr<content::WebContents> InstantController::ReleaseNTPContents() {
-  if (!extended_enabled_ || use_local_overlay_only_)
+  if (!extended_enabled_ || !browser_->profile() ||
+      browser_->profile()->IsOffTheRecord())
     return scoped_ptr<content::WebContents>(NULL);
 
   LOG_INSTANT_DEBUG_EVENT(this, "ReleaseNTPContents");
 
   if (ShouldSwitchToLocalNTP())
     ResetNTP(false, true);
 
-  scoped_ptr<content::WebContents> ntp_contents;
-  if (ntp_)
-    ntp_contents = ntp_->ReleaseContents();
+  scoped_ptr<content::WebContents> ntp_contents = ntp_->ReleaseContents();
 
   // Override the blacklist on an explicit user action.
   ResetNTP(true, false);
   return ntp_contents.Pass();
 }
 
 // TODO(tonyg): This method only fires when the omnibox bounds change. It also
 // needs to fire when the overlay bounds change (e.g.: open/close info bar).
 void InstantController::SetPopupBounds(const gfx::Rect& bounds) {
   if (!extended_enabled_ && !instant_enabled_)
@@ skipping 743 matching lines @@
 #else
   if (IsFullHeight(model_))
     CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
   else if (!IsViewInContents(GetViewGainingFocus(view_gaining_focus),
                              overlay_->contents()))
     HideOverlay();
 #endif
 }
 
 void InstantController::ResetNTP(bool ignore_blacklist, bool use_local_ntp) {
-  ntp_.reset();
   std::string instant_url;
   if (use_local_ntp ||
       !GetInstantURL(browser_->profile(), ignore_blacklist, &instant_url))
     instant_url = chrome::kChromeSearchLocalNtpUrl;
   ntp_.reset(new InstantNTP(this, instant_url));
   ntp_->InitContents(browser_->profile(), browser_->GetActiveWebContents(),
                      base::Bind(&InstantController::ResetNTP,
                                 base::Unretained(this), false, false));
 }
 
@@ skipping 353 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();
 }