Merge 214426 "Add histograms for session startup enum and number..."

> Add histograms for session startup enum and number of URLs to open.
> 
> This CL adds two histograms to UMA:
> - Settings.SessionRestoreOnStartup to enumerate page load settings
> on session startup.
> - Settings.SessionRestoreOnStartupURLs to record the number of URLs
> if page load setting is set to load URLs on session startup.
> 
> BUG=262977
> R=battre@chromium.org, bbudge@chromium.org, mpearson@chromium.org, rockot@chromium.org
> 
> Review URL: https://codereview.chromium.org/21121007

TBR=kerz@chromium.org

Review URL: https://codereview.chromium.org/21130008

git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@214492 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 33 insertions, 0 deletions

diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc
index ed1d5380..1d683ca 100644
--- a/chrome/browser/prefs/pref_metrics_service.cc
+++ b/chrome/browser/prefs/pref_metrics_service.cc
@@ -6,6 +6,7 @@
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ -24,6 +25,17 @@ void PrefMetricsService::RecordLaunchPrefs() {
       profile_->GetPrefs()->GetBoolean(prefs::kShowHomeButton));
   UMA_HISTOGRAM_BOOLEAN("Settings.HomePageIsNewTabPage",
       profile_->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage));
+
+  int restore_on_startup = profile_->GetPrefs()->GetInteger(
+      prefs::kRestoreOnStartup);
+  UMA_HISTOGRAM_ENUMERATION("Settings.StartupPageLoadSettings",
+      restore_on_startup, SessionStartupPref::kPrefValueMax);
+  if (restore_on_startup == SessionStartupPref::kPrefValueURLs) {
+    const int url_list_size = profile_->GetPrefs()->GetList(
+        prefs::kURLsToRestoreOnStartup)->GetSize();
+    UMA_HISTOGRAM_CUSTOM_COUNTS(
+        "Settings.StartupPageLoadURLs", url_list_size, 1, 50, 20);
+  }
 }
 
 // static
diff --git a/chrome/browser/prefs/session_startup_pref.h b/chrome/browser/prefs/session_startup_pref.h
index a31380f..6dbd937 100644
--- a/chrome/browser/prefs/session_startup_pref.h
+++ b/chrome/browser/prefs/session_startup_pref.h
@@ -39,10 +39,13 @@ struct SessionStartupPref {
 
   // For historical reasons the enum and value registered in the prefs don't
   // line up. These are the values registered in prefs.
+  // The values are also recorded in Settings.StartupPageLoadSettings histogram,
+  // so make sure to update histograms.xml if you change these.
   static const int kPrefValueHomePage = 0;  // Deprecated
   static const int kPrefValueLast = 1;
   static const int kPrefValueURLs = 4;
   static const int kPrefValueNewTab = 5;
+  static const int kPrefValueMax = 6;
 
   static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
 
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 010a020..545e6e1 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -10858,6 +10858,17 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Settings.StartupPageLoadSettings" enum="SessionStartupPref">
+  <summary>The startup page settings when a profile is loaded.</summary>
+</histogram>
+
+<histogram name="Settings.StartupPageLoadURLs">
+  <summary>
+    The number of URLs to be loaded on startup when a profile is loaded, if the
+    startup page setting is set to load URLs.
+  </summary>
+</histogram>
+
 <histogram name="SimpleCache.CheckCRCResult" enum="CheckCRCResult">
   <summary>
     Whether or not the CRC was checked at the moment when the last reference to
@@ -17722,6 +17733,13 @@ other types of suffix sets.
   <int value="7" label="UPLOAD_COMPLETE_RESPONSE_ERROR"/>
 </enum>
 
+<enum name="SessionStartupPref" type="int">
+  <int value="0" label="Open home page (unused)"/>
+  <int value="1" label="Continue from last opened pages"/>
+  <int value="4" label="Open URLs"/>
+  <int value="5" label="Open new tab page"/>
+</enum>
+
 <enum name="ShillTerminationActionResult" type="int">
   <summary>
     The termination action result types come from TerminationActionResult in