Remove code for Rappor option from the settings page.

This removes the code the Rappor option on the settings page, which
was disabled by field trial.  See the original changes:
https://codereview.chromium.org/886523003/
https://codereview.chromium.org/932313002

BUG=455898

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

Cr-Commit-Position: refs/heads/master@{#323795}

18 files changed, 11 insertions, 281 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1c888e7..9c1d85b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -12413,9 +12413,6 @@ The following application will be launched if you accept this request:
       <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
         Automatically send usage statistics and crash reports to Google
       </message>
-      <message name="IDS_OPTIONS_ENABLE_RAPPOR" desc="The label of the checkbox to enable/disable rappor metrics logging">
-        Send <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>RAPPOR<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> statistics to Google
-      </message>
       <message name="IDS_OPTIONS_ENABLE_LOGGING_RESTART" desc="The restart string after changing crash and user metrics logging. The text within the | symbols will be made into a link that should indicate to the user that clicking on it will cause Chrome to restart.">
         (requires Chrome |restart|)
       </message>
diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc
index 81e4974..a4a61fe 100644
--- a/chrome/browser/metrics/metrics_reporting_state.cc
+++ b/chrome/browser/metrics/metrics_reporting_state.cc
@@ -80,10 +80,6 @@ void SetMetricsReporting(bool to_update_pref,
 
 } // namespace
 
-bool HasRapporOption() {
-  return base::FieldTrialList::FindFullName("RapporOption") == "Enabled";
-}
-
 void InitiateMetricsReportingChange(
     bool enabled,
     const OnMetricsReportingCallbackType& callback_fn) {
diff --git a/chrome/browser/metrics/metrics_reporting_state.h b/chrome/browser/metrics/metrics_reporting_state.h
index 5d6ff4c..4716929 100644
--- a/chrome/browser/metrics/metrics_reporting_state.h
+++ b/chrome/browser/metrics/metrics_reporting_state.h
@@ -9,9 +9,6 @@
 
 typedef base::Callback<void(bool)> OnMetricsReportingCallbackType;
 
-// Returns true if RAPPOR is controlled by a seperate option.
-bool HasRapporOption();
-
 // Initiates a change to metrics reporting state to the new value of |enabled|.
 // Starts or stops the metrics service based on the new state and then runs
 // |callback_fn| (which can be null) with the updated state (as the operation
diff --git a/chrome/browser/metrics/metrics_services_manager.cc b/chrome/browser/metrics/metrics_services_manager.cc
index 9f55dae..602e34c 100644
--- a/chrome/browser/metrics/metrics_services_manager.cc
+++ b/chrome/browser/metrics/metrics_services_manager.cc
@@ -14,15 +14,12 @@
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/metrics_reporting_state.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"
 #include "content/public/browser/browser_thread.h"
 
@@ -30,24 +27,6 @@
 #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 (Profile* profile : profiles) {
-      if (profile->IsOffTheRecord())
-        continue;
-      all_enabled = all_enabled && profile->GetPrefs()->GetBoolean(
-          prefs::kSafeBrowsingEnabled);
-    }
-  }
-  return all_enabled;
-}
-
 // Posts |GoogleUpdateSettings::StoreMetricsClientInfo| on blocking pool thread
 // because it needs access to IO and cannot work from UI thread.
 void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {
@@ -55,8 +34,6 @@ void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {
       base::Bind(&GoogleUpdateSettings::StoreMetricsClientInfo, client_info));
 }
 
-}  // namespace
-
 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
     : local_state_(local_state),
       may_upload_(false),
@@ -121,44 +98,6 @@ metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
   return metrics_state_manager_.get();
 }
 
-bool MetricsServicesManager::IsRapporEnabled(bool metrics_enabled) const {
-  if (!local_state_->HasPrefPath(rappor::prefs::kRapporEnabled)) {
-    // 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);
-}
-
-rappor::RecordingLevel MetricsServicesManager::GetRapporRecordingLevel(
-    bool metrics_enabled) const {
-  rappor::RecordingLevel recording_level = rappor::RECORDING_DISABLED;
-#if defined(GOOGLE_CHROME_BUILD)
-  if (HasRapporOption()) {
-    if (IsRapporEnabled(metrics_enabled)) {
-      recording_level = metrics_enabled ?
-                        rappor::FINE_LEVEL :
-                        rappor::COARSE_LEVEL;
-    }
-  } else if (metrics_enabled) {
-    recording_level = rappor::FINE_LEVEL;
-  }
-#endif  // defined(GOOGLE_CHROME_BUILD)
-  return recording_level;
-}
-
-void MetricsServicesManager::UpdateRapporService() {
-  GetRapporService()->Update(GetRapporRecordingLevel(may_record_), may_upload_);
-  // The first time this function is called, we can start listening for
-  // changes to RAPPOR option.  This avoids starting the RapporService in
-  // tests which do not intend to start services.
-  if (pref_change_registrar_.IsEmpty() && HasRapporOption()) {
-    pref_change_registrar_.Add(rappor::prefs::kRapporEnabled,
-        base::Bind(&MetricsServicesManager::UpdateRapporService,
-                   base::Unretained(this)));
-  }
-}
-
 void MetricsServicesManager::UpdatePermissions(bool may_record,
                                                bool may_upload) {
   // Stash the current permissions so that we can update the RapporService
@@ -194,7 +133,12 @@ void MetricsServicesManager::UpdatePermissions(bool may_record,
     metrics->Stop();
   }
 
-  UpdateRapporService();
+  rappor::RecordingLevel recording_level = rappor::RECORDING_DISABLED;
+#if defined(GOOGLE_CHROME_BUILD)
+  if (may_record)
+    recording_level = rappor::FINE_LEVEL
+#endif  // defined(GOOGLE_CHROME_BUILD)
+  GetRapporService()->Update(recording_level, may_upload);
 }
 
 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
diff --git a/chrome/browser/metrics/metrics_services_manager.h b/chrome/browser/metrics/metrics_services_manager.h
index 72ec3f7..7a05c80 100644
--- a/chrome/browser/metrics/metrics_services_manager.h
+++ b/chrome/browser/metrics/metrics_services_manager.h
@@ -9,7 +9,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/threading/thread_checker.h"
-#include "components/rappor/rappor_service.h"
 
 class ChromeMetricsServiceClient;
 class PrefService;
@@ -60,12 +59,6 @@ class MetricsServicesManager {
   // Update the managed services when permissions for uploading metrics change.
   void UpdateUploadPermissions(bool may_upload);
 
-  // Returns true iff Rappor reporting is enabled.
-  bool IsRapporEnabled(bool metrics_enabled) const;
-
-  // Returns the recording level for Rappor metrics.
-  rappor::RecordingLevel GetRapporRecordingLevel(bool metrics_enabled) const;
-
  private:
   // Update the managed services when permissions for recording/uploading
   // metrics change.
diff --git a/chrome/browser/metrics/metrics_services_manager_unittest.cc b/chrome/browser/metrics/metrics_services_manager_unittest.cc
deleted file mode 100644
index a930c05..0000000
--- a/chrome/browser/metrics/metrics_services_manager_unittest.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2015 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.
-
-#include "chrome/browser/metrics/metrics_services_manager.h"
-
-#include <string>
-
-#include "base/metrics/field_trial.h"
-#include "base/prefs/testing_pref_service.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_profile_manager.h"
-#include "components/rappor/rappor_pref_names.h"
-#include "components/rappor/rappor_prefs.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-#if defined(GOOGLE_CHROME_BUILD)
-
-void UseRapporOption() {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "RapporOption", "Enabled"));
-}
-
-#endif  // defined(GOOGLE_CHROME_BUILD)
-
-}  // namespace
-
-class MetricsServicesManagerTest : public testing::Test {
- public:
-  MetricsServicesManagerTest()
-      : test_profile_manager_(TestingBrowserProcess::GetGlobal()),
-        manager_(&test_prefs_),
-        field_trial_list_(NULL) {
-    rappor::internal::RegisterPrefs(test_prefs_.registry());
-  }
-
-  void SetUp() override {
-    ASSERT_TRUE(test_profile_manager_.SetUp());
-  }
-
-  void CreateProfile(const std::string& name, bool sb_enabled) {
-    TestingProfile* profile = test_profile_manager_.CreateTestingProfile(name);
-    profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled, sb_enabled);
-  }
-
-  TestingPrefServiceSimple* test_prefs() { return &test_prefs_; }
-
-  MetricsServicesManager* manager() { return &manager_; }
-
- private:
-  TestingProfileManager test_profile_manager_;
-  TestingPrefServiceSimple test_prefs_;
-  MetricsServicesManager manager_;
-  base::FieldTrialList field_trial_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(MetricsServicesManagerTest);
-};
-
-TEST_F(MetricsServicesManagerTest, CheckRapporDefaultDisable) {
-  test_prefs()->ClearPref(rappor::prefs::kRapporEnabled);
-  CreateProfile("profile1", true);
-  CreateProfile("profile2", false);
-  bool uma_enabled = false;
-
-  EXPECT_FALSE(manager()->IsRapporEnabled(uma_enabled));
-  EXPECT_TRUE(test_prefs()->HasPrefPath(rappor::prefs::kRapporEnabled));
-  EXPECT_FALSE(test_prefs()->GetBoolean(rappor::prefs::kRapporEnabled));
-}
-
-TEST_F(MetricsServicesManagerTest, CheckRapporDefaultEnabledBySafeBrowsing) {
-  test_prefs()->ClearPref(rappor::prefs::kRapporEnabled);
-  CreateProfile("profile1", true);
-  CreateProfile("profile2", true);
-  bool uma_enabled = false;
-
-  EXPECT_TRUE(manager()->IsRapporEnabled(uma_enabled));
-  EXPECT_TRUE(test_prefs()->HasPrefPath(rappor::prefs::kRapporEnabled));
-  EXPECT_TRUE(test_prefs()->GetBoolean(rappor::prefs::kRapporEnabled));
-}
-
-TEST_F(MetricsServicesManagerTest, CheckRapporDefaultEnabledByUMA) {
-  test_prefs()->ClearPref(rappor::prefs::kRapporEnabled);
-  CreateProfile("profile1", false);
-  CreateProfile("profile2", false);
-  bool uma_enabled = true;
-
-  EXPECT_TRUE(manager()->IsRapporEnabled(uma_enabled));
-  EXPECT_TRUE(test_prefs()->HasPrefPath(rappor::prefs::kRapporEnabled));
-  EXPECT_TRUE(test_prefs()->GetBoolean(rappor::prefs::kRapporEnabled));
-}
-
-TEST_F(MetricsServicesManagerTest, CheckRapporEnable) {
-  test_prefs()->SetBoolean(rappor::prefs::kRapporEnabled, true);
-  CreateProfile("profile1", false);
-  CreateProfile("profile2", false);
-  bool uma_enabled = false;
-
-  EXPECT_TRUE(manager()->IsRapporEnabled(uma_enabled));
-  EXPECT_TRUE(test_prefs()->HasPrefPath(rappor::prefs::kRapporEnabled));
-  EXPECT_TRUE(test_prefs()->GetBoolean(rappor::prefs::kRapporEnabled));
-}
-
-TEST_F(MetricsServicesManagerTest, CheckRapporDisable) {
-  test_prefs()->SetBoolean(rappor::prefs::kRapporEnabled, false);
-  CreateProfile("profile1", true);
-  CreateProfile("profile2", true);
-  bool uma_enabled = true;
-
-  EXPECT_FALSE(manager()->IsRapporEnabled(uma_enabled));
-  EXPECT_TRUE(test_prefs()->HasPrefPath(rappor::prefs::kRapporEnabled));
-  EXPECT_FALSE(test_prefs()->GetBoolean(rappor::prefs::kRapporEnabled));
-}
-
-#if defined(GOOGLE_CHROME_BUILD)
-
-TEST_F(MetricsServicesManagerTest, GetRecordingLevelDisabled) {
-  UseRapporOption();
-  test_prefs()->SetBoolean(rappor::prefs::kRapporEnabled, false);
-  bool uma_enabled = true;
-
-  EXPECT_EQ(rappor::RECORDING_DISABLED,
-            manager()->GetRapporRecordingLevel(uma_enabled));
-}
-
-TEST_F(MetricsServicesManagerTest, GetRecordingLevelFine) {
-  UseRapporOption();
-  test_prefs()->SetBoolean(rappor::prefs::kRapporEnabled, true);
-  bool uma_enabled = true;
-
-  EXPECT_EQ(rappor::FINE_LEVEL,
-            manager()->GetRapporRecordingLevel(uma_enabled));
-}
-
-TEST_F(MetricsServicesManagerTest, GetRecordingLevelCoarse) {
-  UseRapporOption();
-  test_prefs()->SetBoolean(rappor::prefs::kRapporEnabled, true);
-  bool uma_enabled = false;
-
-  EXPECT_EQ(rappor::COARSE_LEVEL,
-            manager()->GetRapporRecordingLevel(uma_enabled));
-}
-
-#endif  // defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index f046efc..2b60aeb 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -23,7 +23,6 @@
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/policy/core/common/schema.h"
-#include "components/rappor/rappor_pref_names.h"
 #include "components/search_engines/default_search_policy_handler.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "policy/policy_constants.h"
@@ -120,9 +119,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kMetricsReportingEnabled,
     prefs::kMetricsReportingEnabled,
     base::Value::TYPE_BOOLEAN },
-  { key::kMetricsReportingEnabled,
-    rappor::prefs::kRapporEnabled,
-    base::Value::TYPE_BOOLEAN },
   { key::kApplicationLocaleValue,
     prefs::kApplicationLocale,
     base::Value::TYPE_STRING },
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 9e14317..5aa5e0f 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -460,17 +460,6 @@
         </span>
 </if>
       </div>
-      <div id="rappor-setting" class="checkbox controlled-setting-with-label">
-        <label>
-          <input pref="rappor.enabled" type="checkbox"
-              metric="Options_RapporEnabledCheckbox">
-          <span>
-            <span i18n-values=".innerHTML:enableRappor"></span>
-            <span class="controlled-setting-indicator"
-                pref="rappor.enabled"></span>
-          </span>
-        </label>
-      </div>
 </if>  <!-- _google_chrome -->
       <div class="checkbox">
         <label>
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 9e97c6e..b161c32 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -478,11 +478,6 @@ cr.define('options', function() {
         $('metrics-reporting-enabled').checked =
             loadTimeData.getBoolean('metricsReportingEnabledAtStart');
       }
-      // 'rappor-setting' element is only present on Chrome branded builds.
-      if ($('rappor-setting')) {
-        $('rappor-setting').hidden =
-            !loadTimeData.getBoolean('hasRapporOption');
-      }
       $('networkPredictionOptions').onchange = function(event) {
         var value = (event.target.checked ?
             NetworkPredictionOptions.WIFI_ONLY :
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 59f3781..f19127f 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -553,11 +553,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
 
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
 
-  values->SetBoolean("hasRapporOption", HasRapporOption());
-
-  base::string16 rappor_url = base::ASCIIToUTF16(chrome::kRapporLearnMoreURL);
-  values->SetString("enableRappor",
-      l10n_util::GetStringFUTF16(IDS_OPTIONS_ENABLE_RAPPOR, rappor_url));
   values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
 
 #if !defined(OS_CHROMEOS)
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 3dd3c9b..4387bab 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -138,7 +138,6 @@
       'browser/metrics/chrome_metrics_service_accessor_unittest.cc',
       'browser/metrics/cloned_install_detector_unittest.cc',
       'browser/metrics/drive_metrics_provider_unittest.cc',
-      'browser/metrics/metrics_services_manager_unittest.cc',
       'browser/metrics/signin_status_metrics_provider_chromeos_unittest.cc',
       'browser/metrics/signin_status_metrics_provider_unittest.cc',
       'browser/metrics/thread_watcher_android_unittest.cc',
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 2bcade4d..f3031cf 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -486,13 +486,6 @@ const char kPrivacyLearnMoreURL[] =
     "https://support.google.com/chrome/?p=settings_privacy";
 #endif
 
-const char kRapporLearnMoreURL[] =
-#if defined(OS_CHROMEOS)
-    "https://support.google.com/chromeos/?p=rappor";
-#else
-    "https://support.google.com/chrome/?p=rappor";
-#endif
-
 const char kDoNotTrackLearnMoreURL[] =
 #if defined(OS_CHROMEOS)
     "https://support.google.com/chromeos/?p=settings_do_not_track";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index acd1678..fb1f328 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -412,9 +412,6 @@ extern const char kKillReasonURL[];
 // "Learn more" URL for the Privacy section under Options.
 extern const char kPrivacyLearnMoreURL[];
 
-// Help URL for the Rappor setting.
-extern const char kRapporLearnMoreURL[];
-
 // "Learn more" URL for the "Do not track" setting in the privacy section.
 extern const char kDoNotTrackLearnMoreURL[];
 
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 7a4ee9c..4969430 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -974,16 +974,16 @@
       },
       'example_value': True,
       'id': 15,
-      'caption': '''Enable reporting of RAPPOR, usage, and crash-related data''',
-      'desc': '''Enables anonymous reporting of RAPPOR, usage, and crash-related data about <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to Google and prevents users from changing this setting.
+      'caption': '''Enable reporting of usage and crash-related data''',
+      'desc': '''Enables anonymous reporting of usage and crash-related data about <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to Google and prevents users from changing this setting.
 
-      If you enable this setting, anonymous reporting of RAPPOR, usage, and crash-related data is sent to Google.
+      If you enable this setting, anonymous reporting of usage and crash-related data is sent to Google.
 
-      If you disable this setting, anonymous reporting of RAPPOR, usage, and crash-related data is never sent to Google.
+      If you disable this setting, anonymous reporting of usage and crash-related data is never sent to Google.
 
       If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
 
-      If this policy is left not set, RAPPOR will be enabled unless disabled by the user, and the usage and crash reporting setting will be what the user chose upon installation / first run.
+      If this policy is left not set the setting will be what the user chose upon installation / first run.
 
       This policy is not available on Windows instances that are not joined to
       an Active Directory domain.''',
diff --git a/components/rappor/rappor_pref_names.cc b/components/rappor/rappor_pref_names.cc
index 1664f9a..b879c4b 100644
--- a/components/rappor/rappor_pref_names.cc
+++ b/components/rappor/rappor_pref_names.cc
@@ -13,9 +13,6 @@ const char kRapporCohortDeprecated[] = "rappor.cohort";
 // A randomly generated number, which determines cohorts data is reported for.
 const char kRapporCohortSeed[] = "rappor.cohort_seed";
 
-// True if rappor reports should be uploaded.
-const char kRapporEnabled[] = "rappor.enabled";
-
 // Timestamp of the last time we sampled daily metrics.
 const char kRapporLastDailySample[] = "rappor.last_daily_sample";
 
diff --git a/components/rappor/rappor_pref_names.h b/components/rappor/rappor_pref_names.h
index 060a78a..06ea8d5 100644
--- a/components/rappor/rappor_pref_names.h
+++ b/components/rappor/rappor_pref_names.h
@@ -12,7 +12,6 @@ namespace prefs {
 // component. Keep alphabetized, and document each in the .cc file.
 extern const char kRapporCohortDeprecated[];
 extern const char kRapporCohortSeed[];
-extern const char kRapporEnabled[];
 extern const char kRapporLastDailySample[];
 extern const char kRapporSecret[];
 
diff --git a/components/rappor/rappor_prefs.cc b/components/rappor/rappor_prefs.cc
index 93c00b6..b9e3e00c 100644
--- a/components/rappor/rappor_prefs.cc
+++ b/components/rappor/rappor_prefs.cc
@@ -38,7 +38,6 @@ void RecordLoadSecretResult(LoadResult reason) {
 } // namespace
 
 void RegisterPrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kRapporEnabled, true);
   registry->RegisterStringPref(prefs::kRapporSecret, std::string());
   registry->RegisterIntegerPref(prefs::kRapporCohortDeprecated, -1);
   registry->RegisterIntegerPref(prefs::kRapporCohortSeed, -1);
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
index 2565d39..271fe04 100644
--- a/tools/metrics/actions/actions.xml
+++ b/tools/metrics/actions/actions.xml
@@ -9364,16 +9364,6 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
-<action name="Options_RapporEnabledCheckbox_Disable">
-  <owner>holte@chromium.org</owner>
-  <description>Settings: Privacy: RAPPOR disabled</description>
-</action>
-
-<action name="Options_RapporEnabledCheckbox_Enable">
-  <owner>holte@chromium.org</owner>
-  <description>Settings: Privacy: RAPPOR enabled</description>
-</action>
-
 <action name="Options_ResetAutoOpenFiles">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>