[cros,rlz] Remove RLZ checkbox from OOBE UI.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 129 matching lines @@
       previous_screen_(NULL),
 #if defined(GOOGLE_CHROME_BUILD)
       is_official_build_(true),
 #else
       is_official_build_(false),
 #endif
       is_out_of_box_(false),
       host_(host),
       oobe_display_(oobe_display),
       usage_statistics_reporting_(true),
-      rlz_enabled_(false),
       skip_update_enroll_after_eula_(false),
       login_screen_started_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
 }
 
 WizardController::~WizardController() {
   if (default_controller_ == this) {
     default_controller_ = NULL;
@@ skipping 255 matching lines @@
   if (local_state->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
     local_state->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
                                      false,
                                      PrefService::UNSYNCABLE_PREF);
   }
   local_state->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false);
   local_state->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true);
   local_state->RegisterBooleanPref(prefs::kFactoryResetRequested, false);
   local_state->RegisterStringPref(prefs::kRLZBrand, std::string(),
                                   PrefService::UNSYNCABLE_PREF);
-  local_state->RegisterBooleanPref(prefs::kRLZEnabled, false,
-                                   PrefService::UNSYNCABLE_PREF);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnNetworkConnected() {
   if (is_official_build_) {
     if (!IsEulaAccepted()) {
       ShowEulaScreen();
     } else {
       // Possible cases:
@@ skipping 35 matching lines @@
 
   CrosSettings::Get()->SetBoolean(kStatsReportingPref, uma_enabled);
   if (uma_enabled) {
 #if defined(USE_LINUX_BREAKPAD)
     // The crash reporter initialization needs IO to complete.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     InitCrashReporter();
 #endif
   }
 
-  // TODO(ivankr): post-AU action when |kRLZEnabled| is unset.
+  // TODO(ivankr): post-AU action when |kRLZBrand| is unset.
 #if defined(ENABLE_RLZ)
-  SaveBoolPreferenceForced(prefs::kRLZEnabled, rlz_enabled_);
+  LoadBrandCodeFromFile();
+#else
+  OnEulaBlockingTasksDone();
 #endif
-  if (rlz_enabled_)
-    LoadBrandCodeFromFile();
-  else
-    OnEulaBlockingTasksDone();
 }
 
 void WizardController::LoadBrandCodeFromFile() {
   google_util::chromeos::SetBrandFromFile(
       base::Bind(&WizardController::OnEulaBlockingTasksDone,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WizardController::OnEulaBlockingTasksDone() {
   if (skip_update_enroll_after_eula_) {
@@ skipping 344 matching lines @@
 }
 
 void WizardController::SetUsageStatisticsReporting(bool val) {
   usage_statistics_reporting_ = val;
 }
 
 bool WizardController::GetUsageStatisticsReporting() const {
   return usage_statistics_reporting_;
 }
 
-void WizardController::SetRlzEnabled(bool val) {
-#if defined(ENABLE_RLZ)
-  rlz_enabled_ = val;
-#endif
-}
-
-bool WizardController::GetRlzEnabled() const {
-  return rlz_enabled_;
-}
-
 // static
 bool WizardController::IsZeroDelayEnabled() {
   return zero_delay_enabled_;
 }
 
 // static
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
   zero_delay_enabled_ = true;
 }
 
 }  // namespace chromeos