Reload Instant NTP and Instant-process tabs on search url change

chrome/browser/ui/search/instant_ntp_prerenderer.cc

 // Copyright 2013 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_ntp_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 35 matching lines @@
                                              PrefService* prefs)
     : profile_(profile),
       extended_enabled_(chrome::IsInstantExtendedAPIEnabled()) {
   DCHECK(profile);
 
   // In unit tests, prefs may be NULL.
   if (prefs) {
     profile_pref_registrar_.Init(prefs);
     profile_pref_registrar_.Add(
         prefs::kSearchSuggestEnabled,
-        base::Bind(&InstantNTPPrerenderer::ReloadStaleNTP,
-                   base::Unretained(this)));
-    profile_pref_registrar_.Add(
-        prefs::kDefaultSearchProviderID,
-        base::Bind(&InstantNTPPrerenderer::OnDefaultSearchProviderChanged,
+        base::Bind(&InstantNTPPrerenderer::ReloadInstantNTP,
                    base::Unretained(this)));
   }
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 }
 
 InstantNTPPrerenderer::~InstantNTPPrerenderer() {
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
-void InstantNTPPrerenderer::PreloadInstantNTP() {
+void InstantNTPPrerenderer::ReloadInstantNTP() {
   DCHECK(!ntp());

[samarth, 2013/07/26 23:33:15]

Aren't you going to trigger this DCHECK when it is called from stale check
timer?

[Anuj, 2013/07/31 07:16:18]

Done.

-  ReloadStaleNTP();
+  ResetNTP(GetInstantURL());
 }
 
 scoped_ptr<content::WebContents> InstantNTPPrerenderer::ReleaseNTPContents() {
   if (!extended_enabled() || !profile_ || profile_->IsOffTheRecord() ||
       !chrome::ShouldShowInstantNTP())
     return scoped_ptr<content::WebContents>();
 
   if (ShouldSwitchToLocalNTP())
     ResetNTP(GetLocalInstantURL());
 
@@ skipping 136 matching lines @@
 void InstantNTPPrerenderer::InstantPageLoadFailed(
     content::WebContents* contents) {
   DCHECK(ntp() && ntp()->contents() == contents);
 
   bool is_local = ntp()->IsLocal();
   DeleteNTPSoon(ntp_.Pass());
   if (!is_local)
     ResetNTP(GetLocalInstantURL());
 }
 
-void InstantNTPPrerenderer::OnDefaultSearchProviderChanged(
-    const std::string& pref_name) {
-  DCHECK_EQ(pref_name, std::string(prefs::kDefaultSearchProviderID));
-  if (!extended_enabled() || !ntp())
-    return;
-
-  ResetNTP(GetInstantURL());
-}
-
 void InstantNTPPrerenderer::ResetNTP(const std::string& instant_url) {
   // Instant NTP is only used in extended mode so we should always have a
   // non-empty URL to use.
   DCHECK(!instant_url.empty());
   ntp_.reset(new InstantNTP(this, instant_url, profile_));
-  ntp_->InitContents(base::Bind(&InstantNTPPrerenderer::ReloadStaleNTP,
+  ntp_->InitContents(base::Bind(&InstantNTPPrerenderer::ReloadInstantNTP,
                                 base::Unretained(this)));
 }
 
-void InstantNTPPrerenderer::ReloadStaleNTP() {
-  if (!extended_enabled())
-    return;
-
-  ResetNTP(GetInstantURL());
-}
-
 bool InstantNTPPrerenderer::PageIsCurrent() const {
   const std::string& instant_url = GetInstantURL();
   if (instant_url.empty() ||
       !chrome::MatchesOriginAndPath(GURL(ntp()->instant_url()),
                                     GURL(instant_url)))
     return false;
 
   return ntp()->supports_instant();
 }
 
@@ skipping 11 matching lines @@
     return false;
 
   if (PageIsCurrent())
     return false;
 
   // The preloaded NTP does not support instant yet. If we're not in startup,
   // always fall back to the local NTP. If we are in startup, use the local NTP
   // (unless the finch flag to use the remote NTP is set).
   return !(InStartup() && chrome::ShouldPreferRemoteNTPOnStartup());
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// InstantNTPPrerenderer, InstantServiceObserver implementation:
+
+void InstantNTPPrerenderer::DefaultSearchProviderChanged() {
+  ReloadInstantNTP();
+}
+
+void InstantNTPPrerenderer::GoogleURLUpdated() { ReloadInstantNTP(); }