Cleanup in InstantTab and InstantController

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 165152cd26fae6980ab621111b324eb49170e5a9..4952264699ce819f4347e7007d05bdcbc75f8fec 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -57,9 +57,9 @@ class InstantController : public InstantTab::Delegate {
   // Instant search results page.
   void ActiveTabChanged();
 
-  // Adds a new event to |debug_events_| and also DVLOG's it. Ensures that
-  // |debug_events_| doesn't get too large.
-  void LogDebugEvent(const std::string& info) const;

[Marc Treib, 2016/07/21 16:40:09]

Made private

+  // Used by BrowserInstantController to notify InstantController about the
+  // instant support change event for the active web contents.
+  void InstantSupportChanged(InstantSupportState instant_support);
 
   // Resets list of debug events.
   void ClearDebugEvents();
@@ -69,16 +69,6 @@ class InstantController : public InstantTab::Delegate {
     return debug_events_;
   }
 
-  // Used by BrowserInstantController to notify InstantController about the
-  // instant support change event for the active web contents.
-  void InstantSupportChanged(InstantSupportState instant_support);

[Marc Treib, 2016/07/21 16:40:09]

Moved up, above the debug stuff

-
- protected:
-  // Accessors are made protected for testing purposes.
-  virtual InstantTab* instant_tab() const;
-
-  virtual Profile* profile() const;

[Marc Treib, 2016/07/21 16:40:09]

Neither of these are needed

-
  private:
   friend class InstantExtendedManualTest;
   friend class InstantTestBase;
@@ -111,6 +101,10 @@ class InstantController : public InstantTab::Delegate {
   void InstantTabAboutToNavigateMainFrame(const content::WebContents* contents,
                                           const GURL& url) override;
 
+  // Adds a new event to |debug_events_| and also DVLOG's it. Ensures that
+  // |debug_events_| doesn't get too large.
+  void LogDebugEvent(const std::string& info) const;
+
   // If the active tab is an Instant search results page, sets |instant_tab_| to
   // point to it. Else, deletes any existing |instant_tab_|.
   void ResetInstantTab();