diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 16:56:03 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 16:56:03 +0000 |
| commit | 332d17d2d2889750fd87da90c2d9a796163e981c (patch) | |
| tree | 584667b51d7aa63b058606adc8027946ead2046f /chrome/browser/autocomplete/autocomplete_provider_unittest.cc | |
| parent | ac8a16bc1ec072211e6e24a781d0bfd19c6ad9b8 (diff) | |
| download | chromium_src-332d17d2d2889750fd87da90c2d9a796163e981c.zip chromium_src-332d17d2d2889750fd87da90c2d9a796163e981c.tar.gz chromium_src-332d17d2d2889750fd87da90c2d9a796163e981c.tar.bz2 | |
Remove AutocompleteInput Type and PageClassification.
They are just as same as the enums defined in .proto files. Removing
the declaration of these types reduces unnecessary code dependency
to autocomplete.
BUG=384232
R=blundell@chromium.org, mpearson@chromium.org, pkasting@chromium.org
TBR=brettw@chromium.org, cpu@chromium.org, miguelg@chromium.org, mpcomplete@chromium.org
TEST=compile succeeds
Review URL: https://codereview.chromium.org/343523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_provider_unittest.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_provider_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index 1b381fc..aab3b3f 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -25,6 +25,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/metrics/proto/omnibox_event.pb.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" @@ -404,7 +405,7 @@ void AutocompleteProviderTest::RunQuery(const base::string16 query) { result_.Reset(); controller_->Start(AutocompleteInput( query, base::string16::npos, base::string16(), GURL(), - AutocompleteInput::INVALID_SPEC, true, false, true, true)); + metrics::OmniboxEventProto::INVALID_SPEC, true, false, true, true)); if (!controller_->done()) // The message loop will terminate when all autocomplete input has been @@ -422,7 +423,7 @@ void AutocompleteProviderTest::RunExactKeymatchTest( // keyword or not.) controller_->Start(AutocompleteInput( base::ASCIIToUTF16("k test"), base::string16::npos, base::string16(), - GURL(), AutocompleteInput::INVALID_SPEC, true, false, + GURL(), metrics::OmniboxEventProto::INVALID_SPEC, true, false, allow_exact_keyword_match, false)); EXPECT_TRUE(controller_->done()); EXPECT_EQ(AutocompleteProvider::TYPE_SEARCH, @@ -648,7 +649,8 @@ TEST_F(AutocompleteProviderTest, GetDestinationURL) { EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j0&", url.path()); // Test page classification set. - controller_->input_.current_page_classification_ = AutocompleteInput::OTHER; + controller_->input_.current_page_classification_ = + metrics::OmniboxEventProto::OTHER; controller_->search_provider_->field_trial_triggered_in_session_ = false; EXPECT_FALSE( controller_->search_provider_->field_trial_triggered_in_session()); |