InstantExtended: Add new_tab_url to TemplateURL.

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 227 matching lines @@
     SetSearchProvider();
   }
 
   void SetSearchProvider() {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     TemplateURLData data;
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.instant_url = "http://foo.com/instant?"
         "{google:omniboxStartMarginParameter}foo=foo#foo=foo&strk";
+    data.new_tab_url = "http://foo.com/newtab?strk";

[Anuj, 2013/08/13 22:54:33]

Should this change for all tests testing NTP?

(We might have a race condition on submit -
https://codereview.chromium.org/20388003/)

[Jered, 2013/08/14 15:41:49]

Not right now (emailed response).

     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "strk";
 
     TemplateURL* template_url = new TemplateURL(profile(), data);
     // Takes ownership of |template_url|.
     template_url_service->Add(template_url);
     template_url_service->SetDefaultSearchProvider(template_url);
   }
 
   // Build an Instant URL with or without a valid search terms replacement key
@@ skipping 401 matching lines @@
 }
 
 TEST_F(SearchTest, ShouldShowInstantNTP_Default) {
   EnableInstantExtendedAPIForTesting();
   EXPECT_TRUE(ShouldShowInstantNTP());
 }
 
 TEST_F(SearchTest, ShouldShowInstantNTP_DisabledViaFinch) {
   EnableInstantExtendedAPIForTesting();
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
-                                                     "Group1 show_ntp:0"));
+      "Group1 show_ntp:0"));
   EXPECT_FALSE(ShouldShowInstantNTP());
 }
 
-TEST_F(SearchTest, ShouldShowInstantNTP_DisabledByInstantNewTabURLSwitch) {
+TEST_F(SearchTest, ShouldShowInstantNTP_DisabledByUseCacheableNTPFinchFlag) {
   EnableInstantExtendedAPIForTesting();
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kInstantNewTabURL, "http://example.com/newtab");
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended",
+      "Group1 use_cacheable_ntp:1"));
   EXPECT_FALSE(ShouldShowInstantNTP());
 }
 
 TEST_F(SearchTest, IsNTPURL) {
   GURL invalid_url;
   GURL ntp_url(chrome::kChromeUINewTabURL);
   GURL local_ntp_url(GetLocalInstantURL(profile()));
 
   EXPECT_FALSE(chrome::IsNTPURL(invalid_url, profile()));
   EXPECT_FALSE(chrome::IsNTPURL(local_ntp_url, profile()));
@@ skipping 15 matching lines @@
   EXPECT_TRUE(chrome::IsNTPURL(search_url_without_search_terms, profile()));
 
   EXPECT_FALSE(chrome::IsNTPURL(ntp_url, NULL));
   EXPECT_FALSE(chrome::IsNTPURL(local_ntp_url, NULL));
   EXPECT_FALSE(chrome::IsNTPURL(remote_ntp_url, NULL));
   EXPECT_FALSE(chrome::IsNTPURL(search_url_with_search_terms, NULL));
   EXPECT_FALSE(chrome::IsNTPURL(search_url_without_search_terms, NULL));
 }
 
 }  // namespace chrome