More misc. cleanups to minimize future refactoring diffs.

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 101 matching lines @@
     const TemplateURL& default_provider() const {
       DCHECK(valid_default_provider());
       return cached_default_provider_;
     }
 
     const TemplateURL& keyword_provider() const {
       DCHECK(valid_keyword_provider());
       return cached_keyword_provider_;
     }
 
-    // Returns true of the keyword provider is valid.
+    // Returns true if the default provider is valid.
+    bool valid_default_provider() const { return !!default_provider_; }

[sky, 2012/04/10 16:16:22]

nit: !! is obscure.

[Peter Kasting, 2012/04/10 17:53:44]

It is, but I'm just moving this code up from below.  I'll be replacing it
entirely very soon, so I'd rather just leave this for now and kill it later.

+
+    // 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 of 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 |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();
     }
 
    private:
     // 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_;
@@ skipping 43 matching lines @@
   // Returns true when the current query can be sent to the Suggest service.
   // This will be false e.g. when Suggest is disabled, the query contains
   // potentially private data, etc.
   bool IsQuerySuitableForSuggest() const;
 
   // Stops the suggest query.
   // NOTE: This does not update |done_|.  Callers must do so.
   void StopSuggest();
 
   // Creates a URLFetcher requesting suggest results from the specified
-  // |provider|. The caller owns the returned URLFetcher.
-  content::URLFetcher* CreateSuggestFetcher(int id,
-                                            const TemplateURL& provider,
-                                            const string16& text);
+  // |suggestions_url|. The caller owns the returned URLFetcher.
+  content::URLFetcher* CreateSuggestFetcher(
+      int id,
+      const TemplateURLRef& suggestions_url,
+      const string16& text);
 
   // Parses the results from the Suggest server and stores up to kMaxMatches of
   // them in server_results_.  Returns whether parsing succeeded.
   bool ParseSuggestResults(base::Value* root_val,
                            bool is_keyword,
                            const string16& input_text,
                            SuggestResults* suggest_results);
 
   // Converts the parsed server results in server_results_ to a set of
   // AutocompleteMatches and adds them to |matches_|.  This also sets |done_|
@@ skipping 116 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_