InstantExtended: Add new_tab_url to TemplateURL.

chrome/browser/search_engines/template_url_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 "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
@@ skipping 20 matching lines @@
 
   virtual std::string GoogleBaseURLValue() const OVERRIDE;
 
  private:
   std::string google_base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSearchTermsData);
 };
 
 TestSearchTermsData::TestSearchTermsData(const std::string& google_base_url)
-    : google_base_url_(google_base_url)  {
+    : google_base_url_(google_base_url) {
 }
 
 std::string TestSearchTermsData::GoogleBaseURLValue() const {
   return google_base_url_;
 }
 
 // TemplateURLTest ------------------------------------------------------------
 
 class TemplateURLTest : public testing::Test {
  public:
@@ skipping 825 matching lines @@
 }
 
 TEST_F(TemplateURLTest, GetURLOnlyOneURL) {
   TemplateURLData data;
   data.SetURL("http://www.google.co.uk/");
   TemplateURL url(NULL, data);
   ASSERT_EQ(1U, url.URLCount());
   EXPECT_EQ("http://www.google.co.uk/", url.GetURL(0));
 }
 
+TEST_F(TemplateURLTest, GetURLWithNewTabURL) {

[Peter Kasting, 2013/08/14 23:21:45]

TBH I probably wouldn't add this test.

It's so low-level it's nearly equivalent to just calling a simple setter and
getter and verifying they return the same thing.  Not worth it IMO.

Testing that this field properly affects the actual Search/NTP machinery _is_
appropriate and hopefully is covered by search_unittest.cc.

[Jered, 2013/08/15 16:44:03]

Done.

+  TemplateURLData data;
+  data.SetURL("http://google.com/?q={searchTerms}");
+  data.new_tab_url = "http://google.com/newtab";
+  TemplateURL url(NULL, data);
+  EXPECT_EQ("http://google.com/newtab", url.new_tab_url());
+}
+
 TEST_F(TemplateURLTest, ExtractSearchTermsFromURL) {
   TemplateURLData data;
   data.SetURL("http://google.com/?q={searchTerms}");
   data.instant_url = "http://google.com/instant#q={searchTerms}";
   data.alternate_urls.push_back("http://google.com/alt/#q={searchTerms}");
   data.alternate_urls.push_back(
       "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
   TemplateURL url(NULL, data);
   string16 result;
 
@@ skipping 293 matching lines @@
       AutocompleteInput::HOMEPAGE;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://www.google.com/?pgcl=3&q=foo", result);
 }
 
 // Test the IsSearchResults function.
 TEST_F(TemplateURLTest, IsSearchResults) {
   TemplateURLData data;
   data.SetURL("http://bar/search?q={searchTerms}");
   data.instant_url = "http://bar/instant#q={searchTerms}";
+  data.new_tab_url = "http://bar/newtab";
   data.alternate_urls.push_back("http://bar/?q={searchTerms}");
   data.alternate_urls.push_back("http://bar/#q={searchTerms}");
   data.alternate_urls.push_back("http://bar/search#q{searchTerms}");
   data.alternate_urls.push_back("http://bar/webhp#q={searchTerms}");
   TemplateURL search_provider(NULL, data);
 
   const struct {
     const char* const url;
     bool result;
   } url_data[] = {
     { "http://bar/search?q=foo&oq=foo", true, },
     { "http://bar/?q=foo&oq=foo", true, },
     { "http://bar/#output=search&q=foo&oq=foo", true, },
     { "http://bar/webhp#q=foo&oq=foo", true, },
     { "http://bar/#q=foo&oq=foo", true, },
     { "http://bar/?ext=foo&q=foo#ref=bar", true, },
     { "http://bar/url?url=http://www.foo.com/&q=foo#ref=bar", false, },
     { "http://bar/", false, },
     { "http://foo/", false, },
+    { "http://bar/newtab", false, },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_data); ++i) {
     EXPECT_EQ(url_data[i].result,
               search_provider.IsSearchURL(GURL(url_data[i].url)));
   }
 }