Make a copy of PageClassification enum outside the metrics code

chrome/browser/metrics/metrics_log.cc

 // 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.
 
 #include "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 123 matching lines @@
     case AutocompleteMatchType::CONTACT:
       return OmniboxEventProto::Suggestion::CONTACT;
     case AutocompleteMatchType::BOOKMARK_TITLE:
       return OmniboxEventProto::Suggestion::BOOKMARK_TITLE;
     default:
       NOTREACHED();
       return OmniboxEventProto::Suggestion::UNKNOWN_RESULT_TYPE;
   }
 }
 
+OmniboxEventProto::PageClassification AsOmniboxEventPageClassification(
+    AutocompleteInput::PageClassification page_classification) {
+  switch (page_classification) {
+    case AutocompleteInput::INVALID_SPEC:
+      return OmniboxEventProto::INVALID_SPEC;
+    case AutocompleteInput::NEW_TAB_PAGE:
+      return OmniboxEventProto::NEW_TAB_PAGE;
+    case AutocompleteInput::BLANK:
+      return OmniboxEventProto::BLANK;
+    case AutocompleteInput::HOMEPAGE:
+      return OmniboxEventProto::HOMEPAGE;
+    case AutocompleteInput::OTHER:
+      return OmniboxEventProto::OTHER;
+    case AutocompleteInput::INSTANT_NEW_TAB_PAGE:
+      return OmniboxEventProto::INSTANT_NEW_TAB_PAGE;
+    case AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT:
+      return OmniboxEventProto::
+          SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
+    default:

[Ilya Sherman, 2013/07/26 21:40:56]

nit: Please remove the default case, so that it's a compile-time error to forget
to update this.  (You'll still need to have the return stmt, just outside the
switch stmt, to satisfy less wise compilers.)

[Mark P, 2013/07/26 21:55:27]

Done.

+      NOTREACHED();
+      return OmniboxEventProto::INVALID_SPEC;
+  }
+}
+
 ProfilerEventProto::TrackedObject::ProcessType AsProtobufProcessType(
     int process_type) {
   switch (process_type) {
     case content::PROCESS_TYPE_BROWSER:
       return ProfilerEventProto::TrackedObject::BROWSER;
     case content::PROCESS_TYPE_RENDERER:
       return ProfilerEventProto::TrackedObject::RENDERER;
     case content::PROCESS_TYPE_PLUGIN:
       return ProfilerEventProto::TrackedObject::PLUGIN;
     case content::PROCESS_TYPE_WORKER:
@@ skipping 668 matching lines @@
     omnibox_event->set_completed_length(log.completed_length);
   if (log.elapsed_time_since_user_first_modified_omnibox !=
       base::TimeDelta::FromMilliseconds(-1)) {
     // Only upload the typing duration if it is set/valid.
     omnibox_event->set_typing_duration_ms(
         log.elapsed_time_since_user_first_modified_omnibox.InMilliseconds());
   }
   omnibox_event->set_duration_since_last_default_match_update_ms(
       log.elapsed_time_since_last_change_to_default_match.InMilliseconds());
   omnibox_event->set_current_page_classification(
-      log.current_page_classification);
+      AsOmniboxEventPageClassification(log.current_page_classification));
   omnibox_event->set_input_type(AsOmniboxEventInputType(log.input_type));
   for (AutocompleteResult::const_iterator i(log.result.begin());
        i != log.result.end(); ++i) {
     OmniboxEventProto::Suggestion* suggestion = omnibox_event->add_suggestion();
     suggestion->set_provider(i->provider->AsOmniboxEventProviderType());
     suggestion->set_result_type(AsOmniboxEventResultType(i->type));
     suggestion->set_relevance(i->relevance);
     if (i->typed_count != -1)
       suggestion->set_typed_count(i->typed_count);
     suggestion->set_is_starred(i->starred);
@@ skipping 75 matching lines @@
 
       paired_device->set_vendor_prefix(vendor_prefix);
     }
 
     paired_device->set_vendor_id(device->GetVendorID());
     paired_device->set_product_id(device->GetProductID());
     paired_device->set_device_id(device->GetDeviceID());
   }
 #endif  // defined(OS_CHROMEOS)
 }