InstantExtended: Add new_tab_url to TemplateURL.

chrome/browser/search_engines/template_url_prepopulate_data_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/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/prepopulated_engines.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 208 matching lines @@
     EXPECT_NE("foi.com", t_urls[i]->favicon_url().host());
     EXPECT_NE("foo.com", t_urls[i]->url_ref().GetHost());
     EXPECT_NE(1001, t_urls[i]->prepopulate_id());
   }
   // Ensures the default URL is Google and has the optional fields filled.
   EXPECT_EQ(ASCIIToUTF16("Google"), t_urls[default_index]->short_name());
   EXPECT_FALSE(t_urls[default_index]->suggestions_url().empty());
   EXPECT_FALSE(t_urls[default_index]->instant_url().empty());
   EXPECT_FALSE(t_urls[default_index]->image_url().empty());
   EXPECT_FALSE(t_urls[default_index]->image_url_post_params().empty());
+  EXPECT_FALSE(t_urls[default_index]->new_tab_url().empty());

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

Nit: Move up one line (2 places)

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

Done.

   EXPECT_EQ(
       SEARCH_ENGINE_GOOGLE,
       TemplateURLPrepopulateData::GetEngineType(t_urls[default_index]->url()));
 }
 
 // Verifies that built-in search providers are processed correctly.
 TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrepopulated) {
   // Use United States.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kCountry, "US");
@@ skipping 13 matching lines @@
     ASSERT_FALSE(t_urls[i]->input_encodings().empty());
     EXPECT_GT(t_urls[i]->prepopulate_id(), 0);
   }
 
   // Ensures the default URL is Google and has the optional fields filled.
   EXPECT_EQ(ASCIIToUTF16("Google"), t_urls[default_index]->short_name());
   EXPECT_FALSE(t_urls[default_index]->suggestions_url().empty());
   EXPECT_FALSE(t_urls[default_index]->instant_url().empty());
   EXPECT_FALSE(t_urls[default_index]->image_url().empty());
   EXPECT_FALSE(t_urls[default_index]->image_url_post_params().empty());
+  EXPECT_FALSE(t_urls[default_index]->new_tab_url().empty());
   // Expect at least 2 alternate_urls.
   // This caught a bug with static initialization of arrays, so leave this in.
   EXPECT_GT(t_urls[default_index]->alternate_urls().size(), 1u);
   for (size_t i = 0; i < t_urls[default_index]->alternate_urls().size(); ++i)
     EXPECT_FALSE(t_urls[default_index]->alternate_urls()[i].empty());
   EXPECT_EQ(
       SEARCH_ENGINE_GOOGLE,
       TemplateURLPrepopulateData::GetEngineType(t_urls[default_index]->url()));
   EXPECT_FALSE(t_urls[default_index]->search_terms_replacement_key().empty());
 }
@@ skipping 94 matching lines @@
 
 TEST(TemplateURLPrepopulateDataTest, GetLogoURLInvalid) {
   TemplateURLData data;
   data.SetURL("http://invalid:search:url/");
   TemplateURL turl(NULL, data);
   GURL logo_url = TemplateURLPrepopulateData::GetLogoURL(
       turl, TemplateURLPrepopulateData::LOGO_100_PERCENT);
 
   EXPECT_TRUE(logo_url.is_empty());
 }