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

chrome/common/url_constants.h

Index: chrome/common/url_constants.h
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 6c5c565eb2077d0704e3d01d2c8d2a8490095dbf..21f467d0e282e1ea8f05af856dc18e98c07c34eb 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -424,11 +424,10 @@ extern const char kExtensionResourceScheme[];
 //     coming from a blessed Instant process, and deny the request.
 extern const char kChromeSearchScheme[];
 
-// The local omnibox host and pages under chrome-search.
-extern const char kChromeSearchLocalOmniboxPopupHost[];
-extern const char kChromeSearchLocalOmniboxPopupURL[];
+// Pages under chrome-search.
 extern const char kChromeSearchLocalNtpHost[];
 extern const char kChromeSearchLocalNtpUrl[];
+extern const char kChromeSearchLocalGoogleNtpUrl[];
 
 // Host for search suggestions iframes.
 extern const char kChromeSearchSuggestionHost[];