Make Mac and Linux first run dialogs use metrics APIs.

chrome/browser/ui/views/first_run_dialog.cc

Index: chrome/browser/ui/views/first_run_dialog.cc
diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc
index 4a513a9416cc73aa4cf07288ec407c8a219c05e4..f9d4569259326c0a13cebdae4896b6a0d210ac1b 100644
--- a/chrome/browser/ui/views/first_run_dialog.cc
+++ b/chrome/browser/ui/views/first_run_dialog.cc
@@ -4,19 +4,20 @@
 
 #include "chrome/browser/ui/views/first_run_dialog.h"
 
+#include <string>
+
+#include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
-#include "chrome/installer/util/google_update_settings.h"
 #include "components/crash/content/app/breakpad_linux.h"
-#include "components/metrics/metrics_pref_names.h"
 #include "grit/components_strings.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
@@ -29,13 +30,17 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/browser/browser_process.h"
-#include "components/prefs/pref_service.h"
-#endif
-
 using views::GridLayout;
 
+namespace {
+
+void InitCrashReporterIfEnabled(bool enabled) {
+  if (enabled)
+    breakpad::InitCrashReporter(std::string());
+}
+
+}  // namespace
+
 namespace first_run {
 
 bool ShowFirstRunDialog(Profile* profile) {
@@ -50,12 +55,7 @@ bool FirstRunDialog::Show(Profile* profile) {
 
 #if defined(GOOGLE_CHROME_BUILD)
   // If the metrics reporting is managed, we won't ask.
-  const PrefService::Preference* metrics_reporting_pref =
-      g_browser_process->local_state()->FindPreference(
-          metrics::prefs::kMetricsReportingEnabled);
-
-  if (!metrics_reporting_pref ||
-      !metrics_reporting_pref->IsManaged()) {
+  if (!IsMetricsReportingPolicyManaged()) {
     FirstRunDialog* dialog = new FirstRunDialog(profile);
     views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show();
 
@@ -116,12 +116,9 @@ views::View* FirstRunDialog::CreateExtraView() {
 bool FirstRunDialog::Accept() {
   GetWidget()->Hide();
 
-  if (report_crashes_ && report_crashes_->checked()) {
-    if (GoogleUpdateSettings::SetCollectStatsConsent(true))
-      breakpad::InitCrashReporter(std::string());
-  } else {
-    GoogleUpdateSettings::SetCollectStatsConsent(false);
-  }
+  bool consent_given = (report_crashes_ && report_crashes_->checked());

[sky, 2016/05/27 16:13:05]

report_crashes_ is never null. Why the null check?

[Alexei Svitkine (slow), 2016/05/27 18:57:19]

Done. It was in the original code but I agree it's not needed. Also removed the
null check from the make_default_ if below.

+  InitiateMetricsReportingChange(consent_given,
+                                 base::Bind(&InitCrashReporterIfEnabled));
 
   if (make_default_ && make_default_->checked())
     shell_integration::SetAsDefaultBrowser();