Revert of Skip ARC initial screen when everything is set up by policy

chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.cc

 // Copyright 2016 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/arc/optin/arc_optin_preference_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler_observer.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
@@ skipping 54 matching lines @@
 
 void ArcOptInPreferenceHandler::SendMetricsMode() {
   if (g_browser_process->local_state()) {
     observer_->OnMetricsModeChanged(
         ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(),
         IsMetricsReportingPolicyManaged());
   }
 }
 
 void ArcOptInPreferenceHandler::SendBackupAndRestoreMode() {
-  // Override the pref default to the true value, in order to encourage users to
-  // consent with it during OptIn flow.
-  const bool enabled =
-      pref_service_->HasPrefPath(prefs::kArcBackupRestoreEnabled)
-          ? pref_service_->GetBoolean(prefs::kArcBackupRestoreEnabled)
-          : true;
   observer_->OnBackupAndRestoreModeChanged(
-      enabled,
+      pref_service_->GetBoolean(prefs::kArcBackupRestoreEnabled),
       pref_service_->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
 }
 
 void ArcOptInPreferenceHandler::SendLocationServicesMode() {
-  // Override the pref default to the true value, in order to encourage users to
-  // consent with it during OptIn flow.
-  const bool enabled =
-      pref_service_->HasPrefPath(prefs::kArcLocationServiceEnabled)
-          ? pref_service_->GetBoolean(prefs::kArcLocationServiceEnabled)
-          : true;
   observer_->OnLocationServicesModeChanged(
-      enabled,
+      pref_service_->GetBoolean(prefs::kArcLocationServiceEnabled),
       pref_service_->IsManagedPreference(prefs::kArcLocationServiceEnabled));
 }
 
 void ArcOptInPreferenceHandler::EnableMetrics(bool is_enabled) {
   if (g_browser_process->local_state())
     ChangeMetricsReportingState(is_enabled);
 }
 
 void ArcOptInPreferenceHandler::EnableBackupRestore(bool is_enabled) {
   pref_service_->SetBoolean(prefs::kArcBackupRestoreEnabled, is_enabled);
 }
 
 void ArcOptInPreferenceHandler::EnableLocationService(bool is_enabled) {
   pref_service_->SetBoolean(prefs::kArcLocationServiceEnabled, is_enabled);
 }
 
 }  // namespace arc