Remove AutocompleteInput Type and PageClassification.

chrome/browser/metrics/omnibox_metrics_provider.cc

 // Copyright 2014 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/omnibox_metrics_provider.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/omnibox/omnibox_log.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "components/metrics/metrics_log.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 42 matching lines @@
     case AutocompleteMatchType::NAVSUGGEST_PERSONALIZED:
       return OmniboxEventProto::Suggestion::NAVSUGGEST_PERSONALIZED;
     case AutocompleteMatchType::CONTACT_DEPRECATED:
     case AutocompleteMatchType::NUM_TYPES:
       break;
   }
   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::NTP:
-      return OmniboxEventProto::NTP;
-    case AutocompleteInput::BLANK:
-      return OmniboxEventProto::BLANK;
-    case AutocompleteInput::HOME_PAGE:
-      return OmniboxEventProto::HOME_PAGE;
-    case AutocompleteInput::OTHER:
-      return OmniboxEventProto::OTHER;
-    case AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT:
-      return OmniboxEventProto::
-          SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
-    case AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS:
-      return OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
-    case AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS:
-      return OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS;
-    case AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT:
-      return OmniboxEventProto::
-          SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
-  }
-  NOTREACHED();
-  return OmniboxEventProto::INVALID_SPEC;
-}
-
 }  // namespace
 
 OmniboxMetricsProvider::OmniboxMetricsProvider() {
 }
 
 OmniboxMetricsProvider::~OmniboxMetricsProvider() {
 }
 
 void OmniboxMetricsProvider::OnRecordingEnabled() {
   registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
@@ skipping 47 matching lines @@
     // 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());
   }
   if (log.elapsed_time_since_last_change_to_default_match !=
       default_time_delta) {
     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(
-      AsOmniboxEventPageClassification(log.current_page_classification));
+      log.current_page_classification);
   omnibox_event->set_input_type(log.input_type);
   // We consider a paste-and-search/paste-and-go action to have a closed popup
   // (as explained in omnibox_event.proto) even if it was not, because such
   // actions ignore the contents of the popup so it doesn't matter that it was
   // open.
   const bool consider_popup_open = log.is_popup_open && !log.is_paste_and_go;
   omnibox_event->set_is_popup_open(consider_popup_open);
   omnibox_event->set_is_paste_and_go(log.is_paste_and_go);
   if (consider_popup_open) {
     omnibox_event->set_is_top_result_hidden_in_dropdown(
@@ skipping 10 matching lines @@
       suggestion->set_typed_count(i->typed_count);
     suggestion->set_is_starred(i->starred);
   }
   for (ProvidersInfo::const_iterator i(log.providers_info.begin());
        i != log.providers_info.end(); ++i) {
     OmniboxEventProto::ProviderInfo* provider_info =
         omnibox_event->add_provider_info();
     provider_info->CopyFrom(*i);
   }
 }