diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 21:40:26 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 21:40:26 +0000 |
| commit | 11ea072ef514d1b8f6a2a1684f77bd4232b6e634 (patch) | |
| tree | 23db6142200d5e123e7fa38f1bf594ac6684baf3 | |
| parent | cfcbc9fea38635a6b985d3dc68a5a575e024172d (diff) | |
| download | chromium_src-11ea072ef514d1b8f6a2a1684f77bd4232b6e634.zip chromium_src-11ea072ef514d1b8f6a2a1684f77bd4232b6e634.tar.gz chromium_src-11ea072ef514d1b8f6a2a1684f77bd4232b6e634.tar.bz2 | |
Revert 216272 "Add PageClassification to aqs."
Broke AutocompleteProviderTest.GetDestinationURL:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%282%29/builds/15484
> Add PageClassification to aqs.
>
> BUG=264773
>
> Review URL: https://chromiumcodereview.appspot.com/21625002
TBR=hfung@chromium.org
Review URL: https://codereview.chromium.org/22628002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216277 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_controller.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_provider_unittest.cc | 25 |
2 files changed, 4 insertions, 26 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index 492533a..ee39845 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -543,11 +543,10 @@ GURL AutocompleteController::GetDestinationURL( !match.search_terms_args->assisted_query_stats.empty()) { TemplateURLRef::SearchTermsArgs search_terms_args(*match.search_terms_args); search_terms_args.assisted_query_stats += base::StringPrintf( - ".%" PRId64 "j%dj%d", + ".%" PRId64 "j%d", query_formulation_time.InMilliseconds(), search_provider_ && - search_provider_->field_trial_triggered_in_session(), - input_.current_page_classification()); + search_provider_->field_trial_triggered_in_session()); destination_url = GURL(template_url->url_ref(). ReplaceSearchTerms(search_terms_args)); } diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index 7946fd6..8b56cbb 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -628,7 +628,7 @@ TEST_F(AutocompleteProviderTest, GetDestinationURL) { "chrome.0.69i57j69i58j5l2j0l3j69i59"; url = controller_->GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); - EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j0&", url.path()); + EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0&", url.path()); // Test field trial triggered bit set. controller_->search_provider_->field_trial_triggered_in_session_ = true; @@ -636,26 +636,5 @@ TEST_F(AutocompleteProviderTest, GetDestinationURL) { controller_->search_provider_->field_trial_triggered_in_session()); url = controller_->GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); - EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j0&", url.path()); - - // Test page classification set. - controller_->Start(AutocompleteInput( - string16(), string16::npos, string16(), GURL(), - AutocompleteInput::OTHER, true, false, true, - AutocompleteInput::ALL_MATCHES)); - - controller_->search_provider_->field_trial_triggered_in_session_ = false; - EXPECT_FALSE( - controller_->search_provider_->field_trial_triggered_in_session()); - url = controller_->GetDestinationURL(match, - base::TimeDelta::FromMilliseconds(2456)); - EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path()); - - // Test page classification and field trial triggered set. - controller_->search_provider_->field_trial_triggered_in_session_ = true; - EXPECT_TRUE( - controller_->search_provider_->field_trial_triggered_in_session()); - url = controller_->GetDestinationURL(match, - base::TimeDelta::FromMilliseconds(2456)); - EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path()); + EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1&", url.path()); } |