Move SearchTermsData::ForceInstantResultsParam() to chrome::ForceInstantResultsParam().

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"
@@ skipping 782 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()));
 }
 
+TEST_F(SearchTest, ForceInstantResultsParam) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
+                                                     "Group1 espv:2"));
+  EXPECT_TRUE(IsInstantExtendedAPIEnabled());
+  EXPECT_EQ("ion=1&", ForceInstantResultsParam(true));
+  EXPECT_EQ("", ForceInstantResultsParam(false));

[Peter Kasting, 2014/02/14 05:30:00]

Nit: "" -> std::string()

[kmadhusu, 2014/02/14 18:24:04]

Done.

+}
+
 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";
@@ skipping 363 matching lines @@
 }
 
 TEST_F(OriginChipV2Test, CommandLineHideOnUserInput) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableOriginChipV2HideOnUserInput);
   EXPECT_TRUE(ShouldDisplayOriginChipV2());
   EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, GetOriginChipV2HideTrigger());
 }
 
 }  // namespace chrome