autocomplete: Add AutocompleteProvider::Type enum.

chrome/browser/autocomplete/autocomplete_provider.cc

Index: chrome/browser/autocomplete/autocomplete_provider.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc
index d2df9e622fbe0e92d9d9ac9a8495c116b47c773d..cc074c0476cd96e737a13f2ed2e31f3780a13f55 100644
--- a/chrome/browser/autocomplete/autocomplete_provider.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider.cc
@@ -21,14 +21,41 @@
 // static
 const size_t AutocompleteProvider::kMaxMatches = 3;
 
+// static
+const char* AutocompleteProvider::TypeToString(Type type) {
+  switch (type) {
+    case TYPE_BUILTIN:
+      return "Builtin";
+    case TYPE_EXTENSION_APP:
+      return "ExtensionApps";
+    case TYPE_HISTORY_CONTENTS:
+      return "HistoryContents";
+    case TYPE_HISTORY_QUICK:
+      return "HistoryQuick";
+    case TYPE_HISTORY_URL:
+      return "HistoryURL";
+    case TYPE_KEYWORD:
+      return "Keyword";
+    case TYPE_SEARCH:
+      return "Search";
+    case TYPE_SHORTCUTS:
+      return "Shortcuts";
+    case TYPE_ZERO_SUGGEST:
+      return "ZeroSuggest";
+    default:
+      NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type;
+      return "Unknown";
+  }
+}
+
 AutocompleteProvider::AutocompleteProvider(
     AutocompleteProviderListener* listener,
     Profile* profile,
-    const char* name)
+    Type type)
     : profile_(profile),
       listener_(listener),
       done_(true),
-      name_(name) {
+      type_(type) {
 }
 
 void AutocompleteProvider::Stop(bool clear_cached_results) {
@@ -37,29 +64,33 @@ void AutocompleteProvider::Stop(bool clear_cached_results) {
 
 metrics::OmniboxEventProto_ProviderType AutocompleteProvider::
     AsOmniboxEventProviderType() const {

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

Nit: Can this function at least move to the metrics code?

You can ask mpearson if there's any way to eliminate this entirely and just use
the AutocompleteProvider type enum directly.  (Or maybe the metrics code can
just cast one to the other and then we can use comments or assertions or both to
try and ensure the two stay in sync.)

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

SearchProvider::AddProviderInfo() is calling it, too.  Mind if I go with a TODO
for now?

[Mark P, 2012/09/08 22:31:07]

I don't think there's simplification we can do to this at the moment.  We can
change the proto type because it's going in logs and switching logging formats
is a headache (which we've already recently done).  When finally delete the old
XML logging format from the chrome source tree, we should be able to eliminate
AutocompleteProvider::Type entirely and use the proto enum everywhere.

-  if (name_ == "HistoryURL")
-    return metrics::OmniboxEventProto::HISTORY_URL;
-  if (name_ == "HistoryContents")
-    return metrics::OmniboxEventProto::HISTORY_CONTENTS;
-  if (name_ == "HistoryQuick")
-    return metrics::OmniboxEventProto::HISTORY_QUICK;
-  if (name_ == "Search")
-    return metrics::OmniboxEventProto::SEARCH;
-  if (name_ == "Keyword")
-    return metrics::OmniboxEventProto::KEYWORD;
-  if (name_ == "Builtin")
-    return metrics::OmniboxEventProto::BUILTIN;
-  if (name_ == "Shortcuts")
-    return metrics::OmniboxEventProto::SHORTCUTS;
-  if (name_ == "ExtensionApps")
-    return metrics::OmniboxEventProto::EXTENSION_APPS;
-
-  NOTREACHED();
-  return metrics::OmniboxEventProto::UNKNOWN_PROVIDER;
+  switch (type_) {
+    case TYPE_BUILTIN:
+      return metrics::OmniboxEventProto::BUILTIN;
+    case TYPE_EXTENSION_APP:
+      return metrics::OmniboxEventProto::EXTENSION_APPS;
+    case TYPE_HISTORY_CONTENTS:
+      return metrics::OmniboxEventProto::HISTORY_CONTENTS;
+    case TYPE_HISTORY_QUICK:
+      return metrics::OmniboxEventProto::HISTORY_QUICK;
+    case TYPE_HISTORY_URL:
+      return metrics::OmniboxEventProto::HISTORY_URL;
+    case TYPE_KEYWORD:
+      return metrics::OmniboxEventProto::KEYWORD;
+    case TYPE_SEARCH:
+      return metrics::OmniboxEventProto::SEARCH;
+    case TYPE_SHORTCUTS:
+      return metrics::OmniboxEventProto::SHORTCUTS;
+    case TYPE_ZERO_SUGGEST:
+      // TODO: Add to OmniboxEventProto::ProviderType.
+    default:
+      NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type_;
+      return metrics::OmniboxEventProto::UNKNOWN_PROVIDER;
+  }
 }
 
 void AutocompleteProvider::DeleteMatch(const AutocompleteMatch& match) {
-  DLOG(WARNING) << "The AutocompleteProvider '" << name_
+  DLOG(WARNING) << "The AutocompleteProvider '" << name()
                 << "' has not implemented DeleteMatch.";
 }