diff options
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_controller.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_input.h | 3 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_provider_unittest.cc | 21 |
3 files changed, 25 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_input.h b/chrome/browser/autocomplete/autocomplete_input.h index 622d435..3aba2d1 100644 --- a/chrome/browser/autocomplete/autocomplete_input.h +++ b/chrome/browser/autocomplete/autocomplete_input.h @@ -8,6 +8,7 @@ #include <string> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/strings/string16.h" #include "url/gurl.h" #include "url/url_parse.h" @@ -221,6 +222,8 @@ class AutocompleteInput { void Clear(); private: + FRIEND_TEST_ALL_PREFIXES(AutocompleteProviderTest, GetDestinationURL); + // NOTE: Whenever adding a new field here, please make sure to update Clear() // method. string16 text_; diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index 8b56cbb..7f59752 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,22 @@ 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_->input_.current_page_classification_ = AutocompleteInput::OTHER; + 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()); } |