Make EmitNtpStatistics() private.

chrome/browser/ui/webui/ntp/ntp_user_data_logger.h

 // Copyright 2013 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_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 13 matching lines @@
 // Helper class for logging data from the NTP. Attached to each NTP instance.
 class NTPUserDataLogger
     : public content::WebContentsObserver,
       public content::WebContentsUserData<NTPUserDataLogger> {
  public:
   ~NTPUserDataLogger() override;
 
   static NTPUserDataLogger* GetOrCreateFromWebContents(
       content::WebContents* content);
 
-  // Logs a number of statistics regarding the NTP. Called when an NTP tab is
-  // about to be deactivated (be it by switching tabs, losing focus or closing
-  // the tab/shutting down Chrome), or when the user navigates to a URL.
-  void EmitNtpStatistics();
-
   // Called when an event occurs on the NTP that requires a counter to be
   // incremented. |time| is the delta time in ms from navigation start until
   // this event happened.
   void LogEvent(NTPLoggingEventType event, base::TimeDelta time);
 
   // Logs an impression on one of the NTP tiles by a given source.
   void LogMostVisitedImpression(int position, NTPLoggingTileSource tile_source);
 
   // Logs a navigation on one of the NTP tiles by a given source.
   void LogMostVisitedNavigation(int position, NTPLoggingTileSource tile_source);
 
   // content::WebContentsObserver override
   void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
 
+  // Called when the tab is closed. Logs statistics.
+  void TabDeactivated();
+
+  // Called when the set of most visited sites changes. Flushes statistics.
+  void MostVisitedItemsChanged();
+
  protected:
   explicit NTPUserDataLogger(content::WebContents* contents);
 
  private:
   friend class content::WebContentsUserData<NTPUserDataLogger>;
 
   FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
                            OnMostVisitedItemsChangedFromServer);
   FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
                            OnMostVisitedItemsChangedFromClient);
+  FRIEND_TEST_ALL_PREFIXES(NTPUserDataLoggerTest,
+                           TestLogging);
+
+  // To clarify at the call site whether we are calling EmitNtpStatistics() for
+  // a good reason (CLOSED, NAVIGATED_AWAY) or a questionable one (MV_CHANGED,
+  // INTERNAL_FLUSH).
+  // TODO(sfiera): remove MV_CHANGED, INTERNAL_FLUSH.
+  enum class EmitReason { CLOSED, NAVIGATED_AWAY, MV_CHANGED, INTERNAL_FLUSH };
+
+  // Logs a number of statistics regarding the NTP. Called when an NTP tab is
+  // about to be deactivated (be it by switching tabs, losing focus or closing
+  // the tab/shutting down Chrome), or when the user navigates to a URL.
+  void EmitNtpStatistics(EmitReason reason);
 
   // True if at least one iframe came from a server-side suggestion.
   bool has_server_side_suggestions_;
 
   // True if at least one iframe came from a client-side suggestion.
   bool has_client_side_suggestions_;
 
   // Total number of tiles rendered, no matter if it's a thumbnail, a gray tile
   // or an external tile.
   size_t number_of_tiles_;
@@ skipping 31 matching lines @@
   // Are stats being logged during Chrome startup?
   bool during_startup_;
 
   // The URL of this New Tab Page - varies based on NTP version.
   GURL ntp_url_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPUserDataLogger);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_