Adds InstantExtendedEnabledParam to the search request URL iff the query extraction flag is enabled.

chrome/browser/search/search_unittest.cc

 // Copyright (c) 2013 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/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 138 matching lines @@
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("42")));
     TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &TemplateURLServiceFactory::BuildInstanceFor);
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service);
     SetSearchProvider(true, false);
   }
 
-  void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url) {
+  virtual void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url) {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     TemplateURLData data;
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.instant_url = "http://foo.com/instant?"
         "{google:omniboxStartMarginParameter}{google:forceInstantResults}"
         "foo=foo#foo=foo&strk";
     if (set_ntp_url) {
       data.new_tab_url = (insecure_ntp_url ? "http" : "https") +
           std::string("://foo.com/newtab?strk");
@@ skipping 573 matching lines @@
   // "prefetch_results" flag is enabled via field trials.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch",
       "Group1 espv:80 prefetch_results:1"));
   EXPECT_TRUE(ShouldPrefetchSearchResults());
 
   EXPECT_EQ(GURL("https://foo.com/instant?ion=1&foo=foo#foo=foo&strk"),
             GetSearchResultPrefetchBaseURL(profile()));
 }
 
+class SearchURLTest : public SearchTest {
+ protected:
+  virtual void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url)
+      OVERRIDE {
+    TemplateURLService* template_url_service =
+        TemplateURLServiceFactory::GetForProfile(profile());
+    TemplateURLData data;
+    data.SetURL("{google:baseURL}search?"
+                "{google:instantExtendedEnabledParameter}q={searchTerms}");
+    data.search_terms_replacement_key = "espv";
+    template_url_ = new TemplateURL(profile(), data);
+    // Takes ownership of |template_url|.
+    template_url_service->Add(template_url_);
+    template_url_service->SetDefaultSearchProvider(template_url_);
+  }
+
+  TemplateURL* template_url_;

[beaudoin, 2014/02/04 13:55:23]

Nit: Make this a scoped_ptr<> so it's deallocated when test ends.

[kmadhusu, 2014/02/04 16:52:26]

I have a raw pointer because TemplateURLService took ownership of
|template_url_| at line 776. 

[beaudoin, 2014/02/04 16:57:07]

SG. Just update the comment to make it clearer:
// |template_url_service| takes ownership of |template_url|.

[kmadhusu, 2014/02/04 17:09:06]

Done.

+};
+
+TEST_F(SearchURLTest, QueryExtractionEnabled) {
+  EnableQueryExtractionForTesting();
+  EXPECT_TRUE(IsQueryExtractionEnabled());
+  TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
+  GURL result(template_url_->url_ref().ReplaceSearchTerms(search_terms_args));
+  ASSERT_TRUE(result.is_valid());
+  // Query extraction is enabled. Make sure
+  // {google:instantExtendedEnabledParameter} is set in the search URL.
+  EXPECT_EQ("http://www.google.com/search?espv=2&q=foo", result.spec());
+}
+
+TEST_F(SearchURLTest, QueryExtractionDisabled) {
+  EXPECT_FALSE(IsQueryExtractionEnabled());
+  TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
+  GURL result(template_url_->url_ref().ReplaceSearchTerms(search_terms_args));
+  ASSERT_TRUE(result.is_valid());
+  // Query extraction is disabled. Make sure
+  // {google:instantExtendedEnabledParameter} is not set in the search URL.
+  EXPECT_EQ("http://www.google.com/search?q=foo", result.spec());
+}
+
+typedef SearchTest InstantExtendedEnabledParamTest;
+
+TEST_F(InstantExtendedEnabledParamTest, QueryExtractionDisabled) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
+                                                     "Group1 espv:2"));
+  EXPECT_FALSE(IsQueryExtractionEnabled());
+  // Make sure InstantExtendedEnabledParam() returns an empty string for search
+  // requests.
+  EXPECT_EQ("", InstantExtendedEnabledParam(true));
+  EXPECT_EQ("espv=2&", InstantExtendedEnabledParam(false));
+}
+
+TEST_F(InstantExtendedEnabledParamTest, QueryExtractionEnabled) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 espv:2 query_extraction:1"));
+  EXPECT_TRUE(IsQueryExtractionEnabled());
+  // Make sure InstantExtendedEnabledParam() returns a non-empty param string
+  // for search requests.
+  EXPECT_EQ("espv=2&", InstantExtendedEnabledParam(true));
+  EXPECT_EQ("espv=2&", InstantExtendedEnabledParam(false));
+}
+
 typedef SearchTest IsQueryExtractionEnabledTest;
 
 TEST_F(IsQueryExtractionEnabledTest, NotSet) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:2"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_FALSE(IsQueryExtractionEnabled());
   EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
 }
 
@@ skipping 207 matching lines @@
 }
 
 TEST_F(OriginChipTest, CommandLineOriginChipLeadingMenuButton) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableOriginChipLeadingMenuButton);
   EXPECT_TRUE(ShouldDisplayOriginChip());
   EXPECT_EQ(ORIGIN_CHIP_LEADING_MENU_BUTTON, GetOriginChipPosition());
 }
 
 }  // namespace chrome