Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/extension_app_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_EXTENSION_APP_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_EXTENSION_APP_PROVIDER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/window_open_disposition.h"
 
 // This provider is responsible for keeping track of which Extension Apps are
 // installed and their URLs.  An instance of it gets created and managed by
 // AutocompleteController.
 class ExtensionAppProvider : public AutocompleteProvider,
                              public content::NotificationObserver {
  public:
@@ skipping 38 matching lines @@
   // Construct a match for the specified parameters.
   AutocompleteMatch CreateAutocompleteMatch(const AutocompleteInput& input,
                                             const ExtensionApp& app,
                                             size_t name_match_index,
                                             size_t url_match_index);
 
   // Fetch the current app list and cache it locally.
   void RefreshAppList();
 
   // Calculate the relevance of the match.
-  int CalculateRelevance(metrics::OmniboxInputType::Type type,
+  int CalculateRelevance(AutocompleteInput::Type type,
                          int input_length,
                          int target_length,
                          const GURL& url);
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar registrar_;
 
   // Our cache of ExtensionApp objects (name + url) representing the extension
   // apps we know/care about.
   ExtensionApps extension_apps_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_EXTENSION_APP_PROVIDER_H_