Remove AutocompleteInput Type and PageClassification.

chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.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 "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/test/base/ui_test_utils.h"
 #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_;
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
 
   // Test that our extension's keyword is suggested to us when we partially type
   // it.
   {
     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());
 
     // Now, peek into the controller to see if it has the results we expect.
     // First result should be to search for what was typed, second should be to
     // enter "extension keyword" mode.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(2U, result.size()) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, match.type);
     EXPECT_FALSE(match.deletable);
 
     match = result.match_at(1);
     EXPECT_EQ(ASCIIToUTF16("keyword"), match.keyword);
   }
 
   // Test that our extension can send suggestions back to us.
   {
     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());
 
     // Now, peek into the controller to see if it has the results we expect.
     // First result should be to invoke the keyword with what we typed, 2-4
     // should be to invoke with suggestions from the extension, and the last
     // should be to search for what we typed.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(5U, result.size()) << AutocompleteResultAsString(result);
 
@@ skipping 88 matching lines @@
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
   ResultCatcher catcher;
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
   omnibox_view->OnBeforePossibleChange();
   omnibox_view->SetUserText(ASCIIToUTF16("keyword command"));
   omnibox_view->OnAfterPossibleChange();
 
   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);
   EXPECT_TRUE(autocomplete_controller->done());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   omnibox_view->OnBeforePossibleChange();
   omnibox_view->SetUserText(ASCIIToUTF16("keyword newtab"));
   omnibox_view->OnAfterPossibleChange();
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
 
   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);
   EXPECT_TRUE(autocomplete_controller->done());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // Tests that we get suggestions from and send input to the incognito context
 // of an incognito split mode extension.
 // http://crbug.com/100927
@@ skipping 17 matching lines @@
 
   LocationBar* location_bar = GetLocationBar(incognito_browser);
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(incognito_browser);
 
   // Test that we get the incognito-specific suggestions.
   {
     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());
 
     // First result should be to invoke the keyword with what we typed, 2-4
     // should be to invoke with suggestions from the extension, and the last
     // should be to search for what we typed.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(5U, result.size()) << AutocompleteResultAsString(result);
     ASSERT_FALSE(result.match_at(0).keyword.empty());
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion3 incognito"),
               result.match_at(3).fill_into_edit);
   }
 
   // Test that our input is sent to the incognito context. The test will do a
   // text comparison and succeed only if "command incognito" is sent to the
   // incognito context.
   {
     ResultCatcher catcher;
     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();
   }
 }