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

chrome/browser/ui/search/instant_page.cc

Index: chrome/browser/ui/search/instant_page.cc
diff --git a/chrome/browser/ui/search/instant_page.cc b/chrome/browser/ui/search/instant_page.cc
index 0757da208e0c1dc0b30a81238704912264fe5bd8..c21c3078477e9fdb8974f9da4181205e97113cf3 100644
--- a/chrome/browser/ui/search/instant_page.cc
+++ b/chrome/browser/ui/search/instant_page.cc
@@ -17,14 +17,10 @@ InstantPage::Delegate::~Delegate() {
 InstantPage::~InstantPage() {
 }
 
-bool InstantPage::IsLocalNTP() const {
+bool InstantPage::IsLocal() const {
   return contents() &&
-      contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl);
-}
-
-bool InstantPage::IsLocalOverlay() const {
-  return contents() &&
-      contents()->GetURL() == GURL(chrome::kChromeSearchLocalOmniboxPopupURL);
+      (contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||
+       contents()->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));
 }
 
 void InstantPage::Update(const string16& text,