Control zero suggest with a pref, not a switch.

chrome/browser/autocomplete/zero_suggest_provider.h

Index: chrome/browser/autocomplete/zero_suggest_provider.h
diff --git a/chrome/browser/autocomplete/zero_suggest_provider.h b/chrome/browser/autocomplete/zero_suggest_provider.h
index 9240374d458786a06fd77ef9f2d8769f648f168d..9096e79b45de9a54651d183c4ac307ced9a8eeca 100644
--- a/chrome/browser/autocomplete/zero_suggest_provider.h
+++ b/chrome/browser/autocomplete/zero_suggest_provider.h
@@ -26,6 +26,7 @@
 
 class AutocompleteInput;
 class GURL;
+class PrefService;
 class TemplateURLService;
 
 namespace base {
@@ -49,9 +50,12 @@ class URLFetcher;
 class ZeroSuggestProvider : public AutocompleteProvider,
                             public net::URLFetcherDelegate {
  public:
-  ZeroSuggestProvider(AutocompleteProviderListener* listener,
-                      Profile* profile,
-                      const std::string& url_prefix);
+  // Create and return an instance of this provider if the feature is enabled.

[James Hawkins, 2012/09/14 15:45:05]

nit: Creates and returns

[samarth, 2012/09/14 18:25:33]

Done.

+  // Returns NULL if not enabled.
+  static ZeroSuggestProvider* Create(AutocompleteProviderListener* listener,
+                                     Profile* profile);
+
+  static void RegisterUserPrefs(PrefService* user_prefs);
 
   // AutocompleteProvider:
   virtual void Start(const AutocompleteInput& input,
@@ -69,6 +73,10 @@ class ZeroSuggestProvider : public AutocompleteProvider,
   void StartZeroSuggest(const GURL& url, const string16& user_text);
 
  private:
+  ZeroSuggestProvider(AutocompleteProviderListener* listener,
+                      Profile* profile,
+                      const std::string& url_prefix);
+
   virtual ~ZeroSuggestProvider();
 
   // Update matches given the user has typed |user_text|.