Handle TemplateURLService load failure better

chrome/browser/search/instant_service.h

Index: chrome/browser/search/instant_service.h
diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h
index 393d0721fa06c06b3657c61f5e59482b230145f6..c0d80e19386a6df8d67448ab97d0e6d7942659e6 100644
--- a/chrome/browser/search/instant_service.h
+++ b/chrome/browser/search/instant_service.h
@@ -5,44 +5,35 @@
 #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 
-#include <map>
 #include <set>
-#include <string>
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/prefs/pref_change_registrar.h"
-#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/ui/search/instant_search_prerenderer.h"
-#include "chrome/common/instant_types.h"
+#include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "url/gurl.h"
 
-class GURL;
 class InstantIOContext;
+struct InstantMostVisitedItem;
+class InstantSearchPrerenderer;
 class InstantServiceObserver;
-class InstantTestBase;
-class InstantServiceTest;
 class Profile;
+struct ThemeBackgroundInfo;
 class ThemeService;
 
 namespace content {
 class RenderProcessHost;
 }
 
-namespace net {
-class URLRequest;
-}
-
 // Tracks render process host IDs that are associated with Instant.
 class InstantService : public KeyedService,
-                       public content::NotificationObserver {
+                       public content::NotificationObserver,
+                       public TemplateURLServiceObserver {
  public:
   explicit InstantService(Profile* profile);
   virtual ~InstantService();
@@ -108,16 +99,21 @@ class InstantService : public KeyedService,
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
                            MANUAL_SearchesFromFakebox);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
-  FRIEND_TEST_ALL_PREFIXES(InstantServiceTest, SendsSearchURLsToRenderer);
+  FRIEND_TEST_ALL_PREFIXES(InstantServiceEnabledTest,
+                           SendsSearchURLsToRenderer);
 
-  // Overridden from KeyedService:
+  // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
-  // Overridden from content::NotificationObserver:
+  // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // TemplateURLServiceObserver:
+  virtual void OnTemplateURLServiceChanged() OVERRIDE;
+
+

[Jered, 2014/05/06 23:01:18]

nit: I think you can omit this newline

[Peter Kasting, 2014/05/07 22:24:38]

Done.

   // Called when a renderer process is terminated.
   void OnRendererProcessTerminated(int process_id);
 
@@ -132,11 +128,6 @@ class InstantService : public KeyedService,
   // Theme changed notification handler.
   void OnThemeChanged(ThemeService* theme_service);
 
-  void OnGoogleURLUpdated(Profile* profile,
-                          GoogleURLTracker::UpdatedDetails* details);
-
-  void OnDefaultSearchProviderChanged(const std::string& pref_name);
-
   void ResetInstantSearchPrerenderer();
 
   Profile* const profile_;
@@ -158,8 +149,6 @@ class InstantService : public KeyedService,
 
   content::NotificationRegistrar registrar_;
 
-  PrefChangeRegistrar profile_pref_registrar_;
-
   scoped_refptr<InstantIOContext> instant_io_context_;
 
   // Set to NULL if the default search provider does not support Instant.
@@ -168,6 +157,10 @@ class InstantService : public KeyedService,
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantService> weak_ptr_factory_;
 
+  // Used to avoid resetting the instant_prerenderer_ if an unrelated change to
+  // the TemplateURLService occurs.
+  GURL current_search_result_prefetch_base_url_;
+
   DISALLOW_COPY_AND_ASSIGN(InstantService);
 };