Add a Rappor option in the settings page.

chrome/browser/metrics/metrics_services_manager.cc

Index: chrome/browser/metrics/metrics_services_manager.cc
diff --git a/chrome/browser/metrics/metrics_services_manager.cc b/chrome/browser/metrics/metrics_services_manager.cc
index f64ee5f86f4deaa9ef008a11648a61990a6815fc..d71c072c11744b5313b4d47c1f468cc58d75d2ef 100644
--- a/chrome/browser/metrics/metrics_services_manager.cc
+++ b/chrome/browser/metrics/metrics_services_manager.cc
@@ -12,18 +12,41 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
+#include "components/rappor/rappor_pref_names.h"
 #include "components/rappor/rappor_service.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #endif
 
+namespace {
+
+// Check if the safe browsing setting is enabled for all existing profiles.
+bool CheckSafeBrowsingSettings() {
+  bool all_enabled = true;
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  if (profile_manager) {
+    std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
+    for (size_t i = 0; i < profiles.size(); ++i) {
+      if (profiles[i]->IsOffTheRecord())
+        continue;
+      all_enabled = all_enabled && profiles[i]->GetPrefs()->GetBoolean(
+          prefs::kSafeBrowsingEnabled);
+    }
+  }
+  return all_enabled;
+}
+
+}  // namespace
+
 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
     : local_state_(local_state) {
   DCHECK(local_state);
@@ -86,6 +109,15 @@ metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
   return metrics_state_manager_.get();
 }
 
+bool MetricsServicesManager::IsRapporEnabled(bool metrics_enabled) const {
+  if (!local_state_->HasPrefPath(rappor::prefs::kRapporEnabled)) {

[Alexei Svitkine (slow), 2015/02/06 22:31:11]

Can you add a test for this?

[Steven Holte, 2015/02/07 02:26:21]

Done.

+    // For upgrading users, derive an initial setting from UMA / safe browsing.
+    bool should_enable = metrics_enabled || CheckSafeBrowsingSettings();
+    local_state_->SetBoolean(rappor::prefs::kRapporEnabled, should_enable);
+  }
+  return local_state_->GetBoolean(rappor::prefs::kRapporEnabled);
+}
+
 void MetricsServicesManager::UpdatePermissions(bool may_record,
                                                bool may_upload) {
   metrics::MetricsService* metrics = GetMetricsService();
@@ -114,8 +146,18 @@ void MetricsServicesManager::UpdatePermissions(bool may_record,
     metrics->Stop();
   }
 
-  rappor::RecordingLevel recording_level = may_record ?
-      rappor::FINE_LEVEL : rappor::RECORDING_DISABLED;
+  rappor::RecordingLevel recording_level = rappor::RECORDING_DISABLED;
+#if defined(GOOGLE_CHROME_BUILD)
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  if (may_record) {
+    recording_level = rappor::FINE_LEVEL;
+  }
+#else  // defined(OS_IOS) || defined(OS_ANDROID)

[Alexei Svitkine (slow), 2015/02/06 22:31:11]

Why is there different logic between mobile and desktop?

[Steven Holte, 2015/02/06 22:51:46]

Because they have a different settings UI that I haven't added the option to
turn off RAPPOR to yet.  Once that's in I can remove this.  I'll add a TODO.

+  if (IsRapporEnabled(may_record)) {
+    recording_level = may_record ? rappor::FINE_LEVEL : rappor::COARSE_LEVEL;
+  }
+#endif  // defined(OS_IOS) || defined(OS_ANDROID)
+#endif  // defined(GOOGLE_CHROME_BUILD)
   GetRapporService()->Update(recording_level, may_upload);
 }