Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

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/prefs/pref_service.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 225 matching lines @@
     EXPECT_EQ(test.expected_result,
               ShouldAssignURLToInstantRenderer(GURL(test.url), profile()))
         << test.url << " " << test.comment;
   }
 }
 
 TEST_F(SearchTest, ShouldAssignURLToInstantRendererExtendedEnabled) {
   EnableInstantExtendedAPIForTesting();
 
   const SearchTestCase kTestCases[] = {
-    {chrome::kChromeSearchLocalOmniboxPopupURL, true,  ""},
     {chrome::kChromeSearchLocalNtpUrl, true,  ""},
+    {chrome::kChromeSearchLocalGoogleNtpUrl, true,  ""},
     {"https://foo.com/instant?strk",   true,  ""},
     {"https://foo.com/instant#strk",   true,  ""},
     {"https://foo.com/instant?strk=0", true,  ""},
     {"https://foo.com/url?strk",       true,  ""},
     {"https://foo.com/alt?strk",       true,  ""},
     {"http://foo.com/instant",         false, "Non-HTTPS"},
     {"http://foo.com/instant?strk",    false, "Non-HTTPS"},
     {"http://foo.com/instant?strk=1",  false, "Non-HTTPS"},
     {"https://foo.com/instant",        false, "No search terms replacement"},
     {"https://foo.com/?strk",          false, "Non-exact path"},
@@ skipping 26 matching lines @@
   {"https://foo.com/alt?strk",         true,  "Valid alternative URL"},
   {"https://foo.com/alt#strk",         true,  "Valid alternative URL"},
   {"https://foo.com/url?strk&bar=",    true,  "No query terms"},
   {"https://foo.com/url?strk&q=abc",   true,  "No query terms key"},
   {"https://foo.com/url?strk#bar=abc", true,  "Query terms key in ref"},
   {"https://foo.com/url?strk&bar=abc", false, "Has query terms"},
   {"http://foo.com/instant?strk=1",    false, "Insecure URL"},
   {"https://foo.com/instant",          false, "No search terms replacement"},
   {"chrome://blank/",                  false, "Chrome scheme"},
   {"chrome-search//foo",               false, "Chrome-search scheme"},
-  {chrome::kChromeSearchLocalOmniboxPopupURL, false, "Local omnibox popup"},
   {chrome::kChromeSearchLocalNtpUrl,   true,  "Local new tab page"},
+  {chrome::kChromeSearchLocalGoogleNtpUrl,   true,  "Local new tab page"},
   {"https://bar.com/instant?strk=1",   false, "Random non-search page"},
 };
 
 TEST_F(SearchTest, InstantNTPExtendedEnabled) {
   EnableInstantExtendedAPIForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
     NavigateAndCommitActiveTab(GURL(test.url));
     const content::WebContents* contents =
@@ skipping 192 matching lines @@
     TemplateURL* template_url = new TemplateURL(profile(), data);
     // Takes ownership of |template_url|.
     template_url_service->Add(template_url);
     template_url_service->SetDefaultSearchProvider(template_url);
   }
 
   EXPECT_FALSE(DefaultSearchProviderSupportsInstant(profile()));
 }
 
 }  // namespace chrome