diff options
| author | hfung@chromium.org <hfung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 21:04:10 +0000 |
|---|---|---|
| committer | hfung@chromium.org <hfung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 21:04:10 +0000 |
| commit | 946ab83f555014c77e8604c3a747f7bcf1cff26d (patch) | |
| tree | 57e6b8c437b9e691b28e3564b0a83fc5fc3be2bc | |
| parent | 2a76009bf5861d0d9a0a6de9f98e041cc9c4b7a5 (diff) | |
| download | chromium_src-946ab83f555014c77e8604c3a747f7bcf1cff26d.zip chromium_src-946ab83f555014c77e8604c3a747f7bcf1cff26d.tar.gz chromium_src-946ab83f555014c77e8604c3a747f7bcf1cff26d.tar.bz2 | |
Add PageClassification to aqs.
BUG=264773
Review URL: https://chromiumcodereview.appspot.com/21625002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216272 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, 26 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index ee39845..492533a 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -543,10 +543,11 @@ 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%d", + ".%" PRId64 "j%dj%d", query_formulation_time.InMilliseconds(), search_provider_ && - search_provider_->field_trial_triggered_in_session()); + search_provider_->field_trial_triggered_in_session(), + input_.current_page_classification()); 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 8b56cbb..7946fd6 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.2456j0&", url.path()); + EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j0&", url.path()); // Test field trial triggered bit set. controller_->search_provider_->field_trial_triggered_in_session_ = true; @@ -636,5 +636,26 @@ 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.2456j1&", url.path()); + 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()); } |