autocomplete: Add AutocompleteProvider::Type enum.

chrome/browser/autocomplete/autocomplete_controller.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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
+#include "chrome/browser/autocomplete/keyword_provider.h"
+#include "chrome/browser/autocomplete/search_provider.h"
 
 class AutocompleteControllerDelegate;
-class KeywordProvider;
 class Profile;
-class SearchProvider;
 class ZeroSuggestProvider;
 
 // The AutocompleteController is the center of the autocomplete system.  A
 // class creates an instance of the controller, which in turn creates a set of
 // AutocompleteProviders to serve it.  The owning class can ask the controller
 // to Start() a query; the controller in turn passes this call down to the
 // providers, each of which keeps track of its own matches and whether it has
 // finished processing the query.  When a provider gets more matches or finishes
 // processing, it notifies the controller, which merges the combined matches
 // together and makes the result available to interested observers.
@@ skipping 11 matching lines @@
 // matches from a series of providers into one AutocompleteResult.
 class AutocompleteController : public AutocompleteProviderListener {
  public:
   // Used to indicate an index that is not selected in a call to Update().
   static const int kNoItemSelected;
 
   // Normally, you will call the first constructor.  Unit tests can use the
   // second to set the providers to some known testing providers.  The default
   // providers will be overridden and the controller will take ownership of the
   // providers, Release()ing them on destruction.
+  //
+  // |provider_types| is a bitmap containing AutocompleteProvider::Type values
+  // that will (potentially, depending on platform, flags, etc.) be
+  // instantiated.
   AutocompleteController(Profile* profile,
-                         AutocompleteControllerDelegate* delegate);
+                         AutocompleteControllerDelegate* delegate,
+                         int provider_types);
 #ifdef UNIT_TEST
+  // Inlined since UNIT_TEST may or may not have been defined when compiling the
+  // .cc file.

[Peter Kasting, 2012/09/11 00:05:39]

Nit: Comment not really necessary

[Daniel Erat, 2012/09/11 00:42:19]

Done.

   AutocompleteController(const ACProviders& providers, Profile* profile)

[Peter Kasting, 2012/09/11 00:05:39]

So what things are left using this?  Can we TODO to kill this constructor
entirely or is it unlikely we can ever manage that?

[Daniel Erat, 2012/09/11 00:42:19]

chrome/browser/autocomplete/autocomplete_provider_unittest.cc uses it to pass in
test implementations of AutocompleteProvider, and also to add providers in a
particular order (keyword, then search).

I think that that's it, at this point.

       : delegate_(NULL),
         providers_(providers),
         keyword_provider_(NULL),
         search_provider_(NULL),
+        zero_suggest_provider_(NULL),
         done_(true),
         in_start_(false),
+        in_zero_suggest_(false),
         profile_(profile) {
+    for (ACProviders::iterator it = providers_.begin();
+         it != providers_.end(); ++it) {
+      if ((*it)->type() == AutocompleteProvider::TYPE_SEARCH)
+        search_provider_ = static_cast<SearchProvider*>(*it);
+      else if ((*it)->type() == AutocompleteProvider::TYPE_KEYWORD)
+        keyword_provider_ = static_cast<KeywordProvider*>(*it);
+    }
   }
 #endif
   ~AutocompleteController();
 
   // Starts an autocomplete query, which continues until all providers are
   // done or the query is Stop()ed.  It is safe to Start() a new query without
   // Stop()ing the previous one.
   //
   // See AutocompleteInput::desired_tld() for meaning of |desired_tld|.
   //
@@ skipping 47 matching lines @@
 
   // Asks the relevant provider to delete |match|, and ensures observers are
   // notified of resulting changes immediately.  This should only be called when
   // no query is running.
   void DeleteMatch(const AutocompleteMatch& match);
 
   // Removes any entries that were copied from the last result. This is used by
   // the popup to ensure it's not showing an out-of-date query.
   void ExpireCopiedEntries();
 
-#ifdef UNIT_TEST
-  void set_search_provider(SearchProvider* provider) {
-    search_provider_ = provider;
-  }
-  void set_keyword_provider(KeywordProvider* provider) {
-    keyword_provider_ = provider;
-  }
-#endif
   SearchProvider* search_provider() const { return search_provider_; }
   KeywordProvider* keyword_provider() const { return keyword_provider_; }
 
   const AutocompleteInput& input() const { return input_; }
   const AutocompleteResult& result() const { return result_; }
   bool done() const { return done_; }
   const ACProviders* providers() const { return &providers_; }
 
   // AutocompleteProviderListener:
   virtual void OnProviderUpdate(bool updated_matches) OVERRIDE;
@@ skipping 71 matching lines @@
 
   // Has StartZeroSuggest() been called but not Start()?
   bool in_zero_suggest_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_