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

chrome/browser/ui/search/instant_controller.h

Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index fa3cd642c42c497b975666a945b35f49b2bd5879..779dbe9991df76d7477628be6abaff89d1e37436 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -360,12 +360,6 @@ class InstantController : public InstantPage::Delegate,
   // returns false.)
   bool FixSuggestion(InstantSuggestion* suggestion) const;
 
-  // Returns true if we should use |instant_tab_| instead of |overlay_| for
-  // handling suggestions.
-  // TODO(samarth|sreeram): this is brittle. Instead, we should probably just
-  // combine the two local pages into one.
-  bool UseInstantTabToShowSuggestions() const;
-
   // Returns true if we should switch to using the local NTP.
   bool ShouldSwitchToLocalNTP() const;