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

chrome/browser/ui/search/instant_page.h

Index: chrome/browser/ui/search/instant_page.h
diff --git a/chrome/browser/ui/search/instant_page.h b/chrome/browser/ui/search/instant_page.h
index 3bb7270e5093848b7a3704dcb973adbac7b98178..93c9cc8a9b7fc174ba368e85d9dd71d5467dce9c 100644
--- a/chrome/browser/ui/search/instant_page.h
+++ b/chrome/browser/ui/search/instant_page.h
@@ -108,11 +108,7 @@ class InstantPage : public content::WebContentsObserver {
 
   // Returns true if the page is the local NTP (i.e. its URL is
   // chrome::kChromeSearchLocalNTPURL).
-  bool IsLocalNTP() const;
-
-  // Returns true if the page is the local overlay (i.e. its URL is
-  // chrome::kChromeSearchLocalOmniboxPopupURL).
-  bool IsLocalOverlay() const;
+  bool IsLocal() const;
 
   // Tells the page that the user typed |text| into the omnibox. If |verbatim|
   // is false, the page predicts the query the user means to type and fetches