Cleanup in InstantTab and InstantController

chrome/browser/ui/search/instant_controller.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 39 matching lines @@
 
   // The search mode in the active tab has changed. Bind |instant_tab_| if the
   // |new_mode| reflects an Instant search results page.
   void SearchModeChanged(const SearchMode& old_mode,
                          const SearchMode& new_mode);
 
   // The user switched tabs. Bind |instant_tab_| if the newly active tab is an
   // 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();
 
   // See comments for |debug_events_| below.
   const std::list<std::pair<int64_t, std::string>>& debug_events() {
     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;
 
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
@@ skipping 12 matching lines @@
                            DispatchMVChangeEventWhileNavigatingBackToNTP);
 
   // Overridden from InstantTab::Delegate:
   // TODO(shishir): We assume that the WebContent's current RenderViewHost is
   // the RenderViewHost being created which is not always true. Fix this.
   void InstantSupportDetermined(const content::WebContents* contents,
                                 bool supports_instant) override;
   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();
 
   // Sends theme info and most visited items to the Instant tab.
   void UpdateInfoForInstantTab();
 
   // Returns the InstantService for the browser profile.
   InstantService* GetInstantService() const;
 
   BrowserInstantController* const browser_;
 
   // The instance of InstantTab maintained by InstantController.
   std::unique_ptr<InstantTab> instant_tab_;
 
   // The search model mode for the active tab.
   SearchMode search_mode_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64_t, std::string>> debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_