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..3ccc4dc5e44281e6ee2f23e5503c69e45cd8bd46 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -245,6 +245,7 @@ TEST_F(SearchTest, ShouldAssignURLToInstantRendererExtendedEnabled) {
   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,  ""},
@@ -293,6 +294,7 @@ const SearchTestCase kInstantNTPTestCases[] = {
   {"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"},
 };