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

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index e6035e20e675cc22114cad0cefb8a8b82e130278..38845c5140b12fd72c3ec7e5d3330c799a1a8116 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -243,8 +243,8 @@ 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,  ""},
@@ -291,8 +291,8 @@ const SearchTestCase kInstantNTPTestCases[] = {
   {"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"},
 };