Now that TemplateURLs are guaranteed to have a unique, non-empty keyword, replace AutocompleteMatch…

chrome/browser/autocomplete/search_provider.h

 // Copyright (c) 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all non-keyword autocomplete entries that start with
 // "Search <engine> for ...", including searching for the current input string,
 // search history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 //
@@ skipping 12 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "content/public/common/url_fetcher_delegate.h"
 
 class Profile;
+class TemplateURLService;
 
 namespace base {
 class Value;
 }
 
 // Autocomplete provider for searches and suggestions from a search engine.
 //
 // After construction, the autocomplete controller repeatedly calls Start()
 // with some user input, each time expecting to receive a small set of the best
 // matches (either synchronously or asynchronously).
@@ skipping 41 matching lines @@
   virtual ~SearchProvider();
 
   // Manages the providers (TemplateURLs) used by SearchProvider. Two providers
   // may be used:
   // . The default provider. This corresponds to the user's default search
   //   engine. This is always used, except for the rare case of no default
   //   engine.
   // . The keyword provider. This is used if the user has typed in a keyword.
   class Providers {
    public:
-    explicit Providers(Profile* profile)
-        : cached_default_provider_(profile, TemplateURLData()),
-          cached_keyword_provider_(profile, TemplateURLData()),
-          default_provider_(NULL),
-          keyword_provider_(NULL) {
+    explicit Providers(TemplateURLService* template_url_service);
+
+    // Returns true if the specified providers match the two providers cached
+    // by this class.
+    bool equal(const string16& default_provider,
+               const string16& keyword_provider) const {
+      return (default_provider == default_provider_) &&
+          (keyword_provider == keyword_provider_);
     }
 
-    // Returns true if the specified providers match the two providers managed
-    // by this class.
-    bool equals(const TemplateURL* default_provider,
-                const TemplateURL* keyword_provider) {
-      return (default_provider == default_provider_ &&
-              keyword_provider == keyword_provider_);
+    // Resets the cached providers.
+    void set(const string16& default_provider,
+             const string16& keyword_provider) {
+      default_provider_ = default_provider;
+      keyword_provider_ = keyword_provider;
     }
 
-    // Resets the providers.
-    void Set(const TemplateURL* default_provider,
-             const TemplateURL* keyword_provider);
+    TemplateURLService* template_url_service() { return template_url_service_; }
+    string16 default_provider() const { return default_provider_; }

[sky, 2012/05/08 19:55:37]

const string16& (same for keyword_provider()).

+    string16 keyword_provider() const { return keyword_provider_; }
 
-    TemplateURL* default_provider() {
-      DCHECK(valid_default_provider());
-      return &cached_default_provider_;
-    }
+    // NOTE: These may return NULL even if the provider members are nonempty!
+    const TemplateURL* GetDefaultProviderURL() const;
+    const TemplateURL* GetKeywordProviderURL() const;
 
-    TemplateURL* keyword_provider() {
-      DCHECK(valid_keyword_provider());
-      return &cached_keyword_provider_;
-    }
-
-    // Returns true if the default provider is valid.
-    bool valid_default_provider() const { return !!default_provider_; }
-
-    // Returns true if the default provider is valid and has a valid suggest
-    // url.
-    bool valid_suggest_for_default_provider() const {
-      return default_provider_ &&
-          !cached_default_provider_.suggestions_url().empty();
-    }
-
-    // Returns true if the keyword provider is valid.
-    bool valid_keyword_provider() const { return !!keyword_provider_; }
-
-    // Returns true if the keyword provider is valid and has a valid suggest
-    // url.
-    bool valid_suggest_for_keyword_provider() const {
-      return keyword_provider_ &&
-          !cached_keyword_provider_.suggestions_url().empty();
-    }
-
-    // Returns true if |from_keyword_provider| is true, or
-    // the keyword provider is not valid.
+    // Returns true if |from_keyword_provider| is true, or the keyword provider
+    // is not valid.
     bool is_primary_provider(bool from_keyword_provider) const {
-      return from_keyword_provider || !valid_keyword_provider();
+      return from_keyword_provider || keyword_provider_.empty();
     }
 
    private:
+    TemplateURLService* template_url_service_;
+
     // Cached across the life of a query so we behave consistently even if the
     // user changes their default while the query is running.
-    TemplateURL cached_default_provider_;
-    TemplateURL cached_keyword_provider_;
-
-    // TODO(pkasting): http://b/1162970  We shouldn't need these.
-    const TemplateURL* default_provider_;
-    const TemplateURL* keyword_provider_;
+    string16 default_provider_;
+    string16 keyword_provider_;
 
     DISALLOW_COPY_AND_ASSIGN(Providers);
   };
 
   struct NavigationResult {
     NavigationResult(const GURL& url, const string16& site_name)
         : url(url),
           site_name(site_name) {
     }
 
@@ skipping 172 matching lines @@
   // Has FinalizeInstantQuery been invoked since the last |Start|?
   bool instant_finalized_;
 
   // The |suggest_text| parameter passed to FinalizeInstantQuery.
   string16 default_provider_suggest_text_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_