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"
@@ skipping 32 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
   AutocompleteController(const ACProviders& providers, Profile* profile)
       : delegate_(NULL),
         providers_(providers),
         keyword_provider_(NULL),
         search_provider_(NULL),
         done_(true),
         in_start_(false),
         profile_(profile) {
   }
@@ skipping 56 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

[Peter Kasting, 2012/09/07 23:23:02]

Can we kill these?

[Daniel Erat, 2012/09/08 16:37:36]

Done.

But in a fairly ugly manner: the UNIT_TEST implementation of the c'tor, which
needs to appear in this header, iterates through the passed-in providers and
updates these pointers.  This header includes search_provider.h and
keyword_provider.h so it can do downcasts.  I'm not sure that clang won't
complain about this being a non-trivial inline c'tor.

Let me know if you have other suggestions (hopefully not involving major
reworking of the tests to not use this c'tor -- my end goal is still to check in
my contacts changes!).  I could replace the ifdef with a comment saying not to
use the second form outside of tests and then move the implementation to the .cc
file.

   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_; }
 
@@ skipping 78 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_