Instant Extended: Add prominent search term support

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/utf_string_conversions.h"
@@ skipping 20 matching lines @@
 
 namespace {
 
 struct TestItem {
   GURL url;
   string16 expected_text;
   // The expected text to display when query extraction is inactive.
   string16 expected_replace_text_inactive;
   // The expected text to display when query extraction is active.
   string16 expected_replace_text_active;
-  bool would_replace;
+  ToolbarModel::SearchTermType search_term_type;
   bool should_display;
 } test_items[] = {
   {
     GURL("view-source:http://www.google.com"),
     ASCIIToUTF16("view-source:www.google.com"),
     ASCIIToUTF16("view-source:www.google.com"),
     ASCIIToUTF16("view-source:www.google.com"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("view-source:chrome://newtab/"),
     ASCIIToUTF16("view-source:chrome://newtab"),
     ASCIIToUTF16("view-source:chrome://newtab"),
     ASCIIToUTF16("view-source:chrome://newtab"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("chrome-extension://monkey/balls.html"),
     ASCIIToUTF16("chrome-extension://monkey/balls.html"),
     ASCIIToUTF16("chrome-extension://monkey/balls.html"),
     ASCIIToUTF16("chrome-extension://monkey/balls.html"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("chrome://newtab/"),
     string16(),
     string16(),
     string16(),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     false
   },
   {
     GURL(chrome::kAboutBlankURL),
     ASCIIToUTF16(chrome::kAboutBlankURL),
     ASCIIToUTF16(chrome::kAboutBlankURL),
     ASCIIToUTF16(chrome::kAboutBlankURL),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("http://searchurl/?q=tractor+supply"),
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("https://google.ca/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.ca/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.ca/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.ca/search?q=tractor+supply"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("https://google.com/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.com/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.com/search?q=tractor+supply"),
     ASCIIToUTF16("https://google.com/search?q=tractor+supply"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("https://google.com/search?q=tractor+supply&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=tractor+supply&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=tractor+supply&espv=1"),
     ASCIIToUTF16("tractor supply"),
-    true,
+    ToolbarModel::SEARCH_TERM_NORMAL,
     true
   },
   {
     GURL("https://google.com/search?q=tractorsupply.com&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=tractorsupply.com&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=tractorsupply.com&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=tractorsupply.com&espv=1"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
   {
     GURL("https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
     ASCIIToUTF16("https://google.com/search?q=ftp://tractorsupply.ie&espv=1"),
-    false,
+    ToolbarModel::SEARCH_TERM_NONE,
     true
   },
 };
 
 }  // end namespace
 
 class ToolbarModelTest : public BrowserWithTestWindowTest {
  public:
   ToolbarModelTest() {}
 
@@ skipping 18 matching lines @@
         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 NavigateAndCheckText(const GURL& url,
                             const string16& expected_text,
                             const string16& expected_replace_text,
-                            bool would_replace,
+                            ToolbarModel::SearchTermType search_term_type,
                             bool should_display) {
-    NavigateAndCheckTextImpl(url, false, expected_text, would_replace,
+    NavigateAndCheckTextImpl(url, false, expected_text, search_term_type,
                              should_display);
-    NavigateAndCheckTextImpl(url, true, expected_replace_text, would_replace,
+    NavigateAndCheckTextImpl(url, true, expected_replace_text, search_term_type,
                              should_display);
   }
 
   void NavigateAndCheckQueries(const std::vector<const char*>& queries,
-                               bool would_replace) {
+                               ToolbarModel::SearchTermType search_term_type) {
     const std::string kInstantExtendedPrefix(
         "https://google.com/search?espv=1&q=");
 
     chrome::EnableInstantExtendedAPIForTesting();
 
     ResetDefaultTemplateURL();
     AddTab(browser(), GURL(chrome::kAboutBlankURL));
     for (size_t i = 0; i < queries.size(); ++i) {
       std::string url_string = kInstantExtendedPrefix +
           net::EscapeQueryParamValue(queries[i], true);
+      std::string expected_text;
+      if (search_term_type == ToolbarModel::SEARCH_TERM_NONE)
+        expected_text = url_string;
+      else
+        expected_text = std::string(queries[i]);
       NavigateAndCheckTextImpl(GURL(url_string), true,
-                               ASCIIToUTF16(would_replace ?
-                                            std::string(queries[i]) :
-                                            url_string),
-                               would_replace, true);
+                               ASCIIToUTF16(expected_text),
+                               search_term_type, true);
     }
   }
 
  private:
   void NavigateAndCheckTextImpl(const GURL& url,
                                 bool can_replace,
                                 const string16 expected_text,
-                                bool would_replace,
+                                ToolbarModel::SearchTermType search_term_type,
                                 bool should_display) {
     WebContents* contents = browser()->tab_strip_model()->GetWebContentsAt(0);
     browser()->OpenURL(OpenURLParams(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
 
     // Query terms replacement requires that the renderer process be a
     // recognized Instant renderer. Fake it.
     InstantService* instant_service =
         InstantServiceFactory::GetForProfile(profile());
     int process_id = contents->GetRenderProcessHost()->GetID();
     instant_service->AddInstantProcess(process_id);
 
     ToolbarModel* toolbar_model = browser()->toolbar_model();
 
     // Check while loading.
     EXPECT_EQ(should_display, toolbar_model->ShouldDisplayURL());
     EXPECT_EQ(expected_text, toolbar_model->GetText(can_replace));
-    EXPECT_EQ(would_replace,
-              toolbar_model->WouldReplaceSearchURLWithSearchTerms());
+    EXPECT_EQ(search_term_type, toolbar_model->GetSearchTermType());
 
     // Check after commit.
     CommitPendingLoad(&contents->GetController());
     EXPECT_EQ(should_display, toolbar_model->ShouldDisplayURL());
     EXPECT_EQ(expected_text, toolbar_model->GetText(can_replace));
-    EXPECT_EQ(would_replace,
-              toolbar_model->WouldReplaceSearchURLWithSearchTerms());
+    EXPECT_EQ(search_term_type, toolbar_model->GetSearchTermType());
   }
 };
 
 // Test that we don't replace any URLs when the query extraction is disabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionDisabled) {
   ASSERT_FALSE(chrome::IsQueryExtractionEnabled())
       << "This test expects query extraction to be disabled.";
 
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(chrome::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,
                          test_item.expected_replace_text_inactive,
-                         false,
+                         ToolbarModel::SEARCH_TERM_NONE,
                          test_item.should_display);
   }
 }
 
 // Test that we replace URLs when the query extraction API is enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionEnabled) {
   chrome::EnableInstantExtendedAPIForTesting();
 
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(chrome::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,
                          test_item.expected_replace_text_active,
-                         test_item.would_replace,
+                         test_item.search_term_type,
                          test_item.should_display);
   }
 }
 
 // Test that replacement doesn't happen for URLs.
 TEST_F(ToolbarModelTest, DoNotExtractUrls) {
   static const char* const kQueries[] = {
     "www.google.com ",
     "www.google.ca",  // Oh, Canada!
     "www.google.ca.",
     "www.google.ca ",
     "www.google.ca. ",
     "something.xxx",
     "something.travel",
     "bankofamerica.com/",
     "bankofamerica.com/foo",
     "bankofamerica.com/foo bla",
     "BankOfAmerica.BIZ/foo bla",
     "   http:/monkeys",
     "http://monkeys",
     "javascript:alert(1)",
     "JavaScript:alert(1)",
     "localhost",
   };
 
   NavigateAndCheckQueries(
-      std::vector<const char*>(&kQueries[0],
-                               &kQueries[arraysize(kQueries)]), false);
+      std::vector<const char*>(&kQueries[0], &kQueries[arraysize(kQueries)]),
+      ToolbarModel::SEARCH_TERM_NONE);
 }
 
 // Test that replacement does happen for non-URLs.
 TEST_F(ToolbarModelTest, ExtractNonUrls) {
   static const char* const kQueries[] = {
     "facebook.com login",
     "site:amazon.com",
     "e.coli",
     "info:http://www.google.com/",
     "cache:http://www.apple.com/",
     "9/11",
     "<nomatch/>",
     "ac/dc",
     "ps/2",
   };
 
   NavigateAndCheckQueries(
-      std::vector<const char*>(&kQueries[0],
-                               &kQueries[arraysize(kQueries)]), true);
+      std::vector<const char*>(&kQueries[0], &kQueries[arraysize(kQueries)]),
+      ToolbarModel::SEARCH_TERM_NORMAL);
 }
+
+// Verify that URL search terms are correctly identified.
+TEST_F(ToolbarModelTest, ProminentSearchTerm) {
+  static const char* const kQueries[] = {
+    "example.com"
+  };
+  browser()->toolbar_model()->SetIsProminentSearchTermUISupported(true);
+  NavigateAndCheckQueries(
+      std::vector<const char*>(&kQueries[0], &kQueries[arraysize(kQueries)]),
+      ToolbarModel::SEARCH_TERM_PROMINENT);
+}