Remove AutocompleteInput Type and PageClassification.

chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
index d51d7a446eaaad3b35421c6529000f0ee72de648..1d2fab1d9f480352cdb72eaa275ba70285b32a11 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
@@ -18,6 +18,7 @@
 #include "ui/base/window_open_disposition.h"
 
 using base::ASCIIToUTF16;
+using metrics::OmniboxEventProto;
 
 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
@@ -35,7 +36,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
   {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keywor"), base::string16::npos,
-                          base::string16(), GURL(), AutocompleteInput::NTP,
+                          base::string16(), GURL(), OmniboxEventProto::NTP,
                           true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
@@ -58,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keyword suggestio"),
                           base::string16::npos, base::string16(), GURL(),
-                          AutocompleteInput::NTP, true, false, true, true));
+                          OmniboxEventProto::NTP, true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
@@ -167,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
 
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword command"), base::string16::npos,
-                        base::string16(), GURL(), AutocompleteInput::NTP,
+                        base::string16(), GURL(), OmniboxEventProto::NTP,
                         true, false, true, true));
   omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
   WaitForAutocompleteDone(autocomplete_controller);
@@ -182,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
 
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword newtab"), base::string16::npos,
-                        base::string16(), GURL(), AutocompleteInput::NTP,
+                        base::string16(), GURL(), OmniboxEventProto::NTP,
                         true, false, true, true));
   omnibox_view->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
   WaitForAutocompleteDone(autocomplete_controller);
@@ -220,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keyword suggestio"),
                           base::string16::npos, base::string16(), GURL(),
-                          AutocompleteInput::NTP, true, false, true, true));
+                          OmniboxEventProto::NTP, true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
@@ -242,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keyword command incognito"),
                           base::string16::npos, base::string16(), GURL(),
-                          AutocompleteInput::NTP, true, false, true, true));
+                          OmniboxEventProto::NTP, true, false, true, true));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }