Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/omnibox/omnibox_log.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_OMNIBOX_OMNIBOX_LOG_H_
 #define CHROME_BROWSER_OMNIBOX_OMNIBOX_LOG_H_
 
 #include <stddef.h>
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "components/metrics/proto/omnibox_input_type.pb.h"
 
 class AutocompleteResult;
 
 // The data to log (via the metrics service) when the user selects an item from
 // the omnibox popup.
 struct OmniboxLog {
   OmniboxLog(
       const base::string16& text,
       bool just_deleted_text,
-      metrics::OmniboxInputType::Type input_type,
+      AutocompleteInput::Type input_type,
       bool is_popup_open,
       size_t selected_index,
       bool is_paste_and_go,
       SessionID::id_type tab_id,
       AutocompleteInput::PageClassification current_page_classification,
       base::TimeDelta elapsed_time_since_user_first_modified_omnibox,
       size_t completed_length,
       base::TimeDelta elapsed_time_since_last_change_to_default_match,
       const AutocompleteResult& result);
   ~OmniboxLog();
 
   // The user's input text in the omnibox.
   base::string16 text;
 
   // Whether the user deleted text immediately before selecting an omnibox
   // suggestion.  This is usually the result of pressing backspace or delete.
   bool just_deleted_text;
 
   // The detected type of the user's input.
-  metrics::OmniboxInputType::Type input_type;
+  AutocompleteInput::Type input_type;
 
   // True if the popup is open.
   bool is_popup_open;
 
   // The index of the item selected in the dropdown list.  Set to 0 if the
   // dropdown is closed (and therefore there is only one implicit suggestion).
   size_t selected_index;
 
   // True if this is a paste-and-search or paste-and-go omnibox interaction.
   // (The codebase refers to both these types as paste-and-go.)
@@ skipping 34 matching lines @@
   // Result set.
   const AutocompleteResult& result;
 
   // Diagnostic information from providers.  See
   // AutocompleteController::AddProvidersInfo() and
   // AutocompleteProvider::AddProviderInfo() above.
   ProvidersInfo providers_info;
 };
 
 #endif  // CHROME_BROWSER_OMNIBOX_OMNIBOX_LOG_H_