Implement Bookmark Autocomplete Provider

chrome/browser/autocomplete/autocomplete_controller.cc

Index: chrome/browser/autocomplete/autocomplete_controller.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_controller.cc	(revision 156377)
+++ chrome/browser/autocomplete/autocomplete_controller.cc	(working copy)
@@ -15,6 +15,7 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
+#include "chrome/browser/autocomplete/bookmark_provider.h"
 #include "chrome/browser/autocomplete/builtin_provider.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
@@ -139,6 +140,11 @@
     providers_.push_back(zero_suggest_provider_);
   }
 
+  // Disable the BookmarkProvider if there the switch says so.
+  if ((provider_types & AutocompleteProvider::TYPE_BOOKMARK) &&
+      !cl->HasSwitch(switches::kDisableBookmarkAutocompleteProvider))
+    providers_.push_back(new BookmarkProvider(this, profile));
+
   for (ACProviders::iterator i(providers_.begin()); i != providers_.end(); ++i)
     (*i)->AddRef();
 }