Update defaults for InstantExtended.

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 137 matching lines @@
  public:
   ToolbarModelTest();
   virtual ~ToolbarModelTest();
 
   // BrowserWithTestWindowTest:
   virtual void SetUp() OVERRIDE;
 
  protected:
   void ResetDefaultTemplateURL();
   void NavigateAndCheckText(const GURL& url,
+                            const std::string& template_search_url,
                             const string16& expected_text,
                             const string16& expected_replace_text,
                             bool would_perform_search_term_replacement,
                             bool should_display_url);
 
  private:
-  void ResetTemplateURLForInstant(const GURL& instant_url);
+  void ResetTemplateURLForInstant(const std::string& template_search_url);
   void NavigateAndCheckTextImpl(const GURL& url,
+                                const std::string& template_search_url,
                                 bool allow_search_term_replacement,
                                 const string16 expected_text,
                                 bool would_perform_search_term_replacement,
                                 bool should_display);
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModelTest);
 };
 
 ToolbarModelTest::ToolbarModelTest() {
 }
 
 ToolbarModelTest::~ToolbarModelTest() {
 }
 
 void ToolbarModelTest::SetUp() {
   BrowserWithTestWindowTest::SetUp();
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
   UIThreadSearchTermsData::SetGoogleBaseURL("http://google.com/");
 }
 
 void ToolbarModelTest::ResetDefaultTemplateURL() {
-  ResetTemplateURLForInstant(GURL("http://does/not/exist"));
+  ResetTemplateURLForInstant("{google:baseURL}search?q={searchTerms}&espv=1");
 }
 
 void ToolbarModelTest::NavigateAndCheckText(
     const GURL& url,
+    const std::string& template_search_url,
     const string16& expected_text,
     const string16& expected_replace_text,
     bool would_perform_search_term_replacement,
     bool should_display_url) {
-  NavigateAndCheckTextImpl(url, false, expected_text,
+  NavigateAndCheckTextImpl(url, template_search_url, false, expected_text,
                            would_perform_search_term_replacement,
                            should_display_url);
-  NavigateAndCheckTextImpl(url, true, expected_replace_text,
+  NavigateAndCheckTextImpl(url, template_search_url, true,
+                           expected_replace_text,
                            would_perform_search_term_replacement,
                            should_display_url);
 }
 
-void ToolbarModelTest::ResetTemplateURLForInstant(const GURL& instant_url) {
+void ToolbarModelTest::ResetTemplateURLForInstant(
+    const std::string& template_search_url) {
   TemplateURLData data;
   data.short_name = ASCIIToUTF16("Google");
-  data.SetURL("{google:baseURL}search?q={searchTerms}");
-  data.instant_url = instant_url.spec();
+  data.SetURL(template_search_url);
+  data.instant_url = "http://www.google.com/instant?strk=1";
   data.search_terms_replacement_key = "{google:instantExtendedEnabledKey}";
   TemplateURL* search_template_url = new TemplateURL(profile(), data);
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   template_url_service->Add(search_template_url);
   template_url_service->SetDefaultSearchProvider(search_template_url);
   ASSERT_NE(0, search_template_url->id());
   template_url_service->Load();
 }
 
 void ToolbarModelTest::NavigateAndCheckTextImpl(
     const GURL& url,
+    const std::string& template_search_url,
     bool allow_search_term_replacement,
     const string16 expected_text,
     bool would_perform_search_term_replacement,
     bool should_display_url) {
-  // The URL being navigated to should be treated as the Instant URL. Else
-  // there will be no search term extraction.
-  ResetTemplateURLForInstant(url);
+  // Override the template search URL with the provided one, if not empty.
+  if (!template_search_url.empty())
+    ResetTemplateURLForInstant(template_search_url);
 
   // Check while loading.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(url, content::Referrer(), content::PAGE_TRANSITION_LINK,
                       std::string());
   ToolbarModel* toolbar_model = browser()->toolbar_model();
   EXPECT_EQ(should_display_url, toolbar_model->ShouldDisplayURL());
   EXPECT_EQ(expected_text,
             toolbar_model->GetText(allow_search_term_replacement));
@@ skipping 30 matching lines @@
 
 // Test that we only replace URLs when query extraction and search term
 // replacement are enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURL) {
   // Before we enable instant extended, query extraction is disabled.
   EXPECT_FALSE(chrome::IsQueryExtractionEnabled())
       << "This test expects query extraction to be disabled.";
   AddTab(browser(), GURL(content::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url, test_item.expected_text,
+    NavigateAndCheckText(test_item.url, "",

[Peter Kasting, 2013/10/02 00:21:40]

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

+                         test_item.expected_text,
                          test_item.expected_replace_text_inactive, false,
                          test_item.should_display_url);
   }
 
-  // Once we enable it, query extraction and search term replacement are
-  // enabled by default.
-  chrome::EnableInstantExtendedAPIForTesting();
+  chrome::EnableQueryExtractionForTesting();
   EXPECT_TRUE(chrome::IsQueryExtractionEnabled());
   EXPECT_TRUE(browser()->toolbar_model()->search_term_replacement_enabled());
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url, test_item.expected_text,
+    NavigateAndCheckText(test_item.url, "",
+                         test_item.expected_text,
                          test_item.expected_replace_text_active,
                          test_item.would_perform_search_term_replacement,
                          test_item.should_display_url);
   }
 
   // Disabling search term replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_search_term_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url, test_item.expected_text,
+    NavigateAndCheckText(test_item.url, "",
+                         test_item.expected_text,
                          test_item.expected_replace_text_inactive, false,
                          test_item.should_display_url);
   }
 }
 
 // Verify that search terms are extracted while the page is loading.
 TEST_F(ToolbarModelTest, SearchTermsWhileLoading) {
-  chrome::EnableInstantExtendedAPIForTesting();
+  chrome::EnableQueryExtractionForTesting();
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(content::kAboutBlankURL));
 
   // While loading, we should be willing to extract search terms.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"),
                       content::Referrer(), content::PAGE_TRANSITION_LINK,
                       std::string());
   ToolbarModel* toolbar_model = browser()->toolbar_model();
   controller->GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_TRUE(toolbar_model->WouldPerformSearchTermReplacement(false));
 
   // When done loading, we shouldn't extract search terms if we didn't get an
   // authenticated connection.
   CommitPendingLoad(controller);
   controller->GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_FALSE(toolbar_model->WouldPerformSearchTermReplacement(false));
 }
 
 // When the Google base URL is overridden on the command line, we should extract
 // search terms from URLs that start with that base URL even when they're not
 // secure.
 TEST_F(ToolbarModelTest, GoogleBaseURL) {
-  chrome::EnableInstantExtendedAPIForTesting();
+  chrome::EnableQueryExtractionForTesting();
   AddTab(browser(), GURL(content::kAboutBlankURL));
 
   // If the Google base URL wasn't specified on the command line, then if it's
   // HTTP, we should not extract search terms.
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
+      "http://www.foo.com/search?q={queryTerms}&espv=1",

[Peter Kasting, 2013/10/02 00:21:40]

Can we avoid passing this argument entirely by using "http://www.google.com/" as
the Google base URL and changing these tests to be based on google.com?  Or does
this set of conditionals only kick in for non-"google.xxx" URLs?

[samarth, 2013/10/02 00:52:42]

On further inspection, none of the template URL resetting is necessary.  I nuked
it all.

       ASCIIToUTF16("www.foo.com/search?q=tractor+supply&espv=1"),
       ASCIIToUTF16("www.foo.com/search?q=tractor+supply&espv=1"), false,
       true);
 
   // The same URL, when specified on the command line, should allow search term
   // extraction.
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
                                                       "http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
+      "http://www.foo.com/search?q={searchTerms}&espv=1",
       ASCIIToUTF16("www.foo.com/search?q=tractor+supply&espv=1"),
       ASCIIToUTF16("tractor supply"), true, true);
 }