PART1: Initiated the SignedSettings refactoring.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2011 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/existing_user_controller.h"
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/views_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
@@ skipping 33 matching lines @@
 // static
 ExistingUserController* ExistingUserController::current_controller_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExistingUserController, public:
 
 ExistingUserController::ExistingUserController(LoginDisplayHost* host)
     : login_status_consumer_(NULL),
       host_(host),
       num_login_attempts_(0),
-      user_settings_(new UserCrosSettingsProvider),
-      method_factory_(this),
+      user_settings_(CrosSettings::Get()),
+      pointer_factory_(this),
       is_owner_login_(false) {
   DCHECK(current_controller_ == NULL);
   current_controller_ = this;
 
   login_display_ = host_->CreateLoginDisplay(this);
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  NotificationService::AllSources());
 }
 
 void ExistingUserController::Init(const UserVector& users) {
   UserVector filtered_users;
-  if (UserCrosSettingsProvider::cached_show_users_on_signin()) {
-    for (size_t i = 0; i < users.size(); ++i)
+  bool show_users_on_signin;
+
+  user_settings_->GetBoolean(kAccountsPrefShowUserNamesOnSignIn,
+                             &show_users_on_signin);

[Mattias Nissler (ping if slow), 2011/09/21 11:12:59]

We have a long-standing bug about this value being read to early and the UI not
reflecting the actual device setting once we retrieved it. I had hoped the
refactoring will also address this or at least lay some groundwork for solving
this. One option could be to built a setting change observer mechanism into
CrosSettings that we could use here to register for changes (or the event of
data being loaded from session_manager in this case). Not necessarily something
for this CL, but worth considering in the design.

[pastarmovj, 2011/09/23 15:19:32]

Actually CrosSettings supports observer interface so I put a todo here to use
that to make this policy change aware once I make sure this interface actually
does what it should do.

+  if (show_users_on_signin) {
+    bool allow_new_user = false;
+    const ListValue *user_list;
+    user_settings_->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
+    user_settings_->GetList(kAccountsPrefUsers, &user_list);
+    for (size_t i = 0; i < users.size(); ++i) {
       // TODO(xiyuan): Clean user profile whose email is not in whitelist.
-      if (UserCrosSettingsProvider::cached_allow_new_user() ||
-          UserCrosSettingsProvider::IsEmailInCachedWhitelist(
-              users[i].email())) {
+      if (allow_new_user ||
+          user_list->Find(StringValue(users[i].email())) != user_list->end()) {
         filtered_users.push_back(users[i]);
       }
+    }
   }
 
   // If no user pods are visible, fallback to single new user pod which will
   // have guest session link.
-  bool show_guest = UserCrosSettingsProvider::cached_allow_guest() &&
-                    !filtered_users.empty();
+  bool show_guest;
+  user_settings_->GetBoolean(kAccountsPrefAllowGuest, &show_guest);
+  show_guest &= !filtered_users.empty();
   bool show_new_user = true;
   login_display_->set_parent_window(GetNativeWindow());
   login_display_->Init(filtered_users, show_guest, show_new_user);
 
   LoginUtils::Get()->PrewarmAuthentication();
   if (CrosLibrary::Get()->EnsureLoaded())
     CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
   StartAutomaticFreeDiskSpaceControl();
 }
 
@@ skipping 103 matching lines @@
       false, true);
 }
 
 void ExistingUserController::LoginAsGuest() {
   SetStatusAreaEnabled(false);
   // Disable clicking on other windows.
   login_display_->SetUIEnabled(false);
 
   // Check allow_guest in case this call is fired from key accelerator.
   // Must not proceed without signature verification.
-  bool trusted_setting_available = user_settings_->RequestTrustedAllowGuest(
-      method_factory_.NewRunnableMethod(
-          &ExistingUserController::LoginAsGuest));
+  bool trusted_setting_available = user_settings_->GetTrusted(
+      kAccountsPrefAllowGuest,
+      base::Bind(&ExistingUserController::LoginAsGuest,
+                 pointer_factory_.GetWeakPtr()));

[Denis Lagno, 2011/09/22 13:54:05]

Are you really sure that this one still works as expected?
AFAIU WeakPtr turns to NULL when object is destructed.
I am not sure that code that calls callback checks that weak pointer to object
is not NULL.

[pastarmovj, 2011/09/23 15:19:32]

The Closure will take care of not calling run on a WeakPtr that has been
null-ed. So the tasks will cancel once the weak pointers held by the
WeakPtrFactory get invalided which happens in the destructor of the factory.

   if (!trusted_setting_available) {
     // Value of AllowGuest setting is still not verified.
     // Another attempt will be invoked again after verification completion.
     return;
   }
-  if (!UserCrosSettingsProvider::cached_allow_guest()) {
+  bool allow_guest;
+  user_settings_->GetBoolean(kAccountsPrefAllowGuest, &allow_guest);
+  if (!allow_guest) {
     // Disallowed.
     return;
   }
 
   // Only one instance of LoginPerformer should exist at a time.
   login_performer_.reset(NULL);
   login_performer_.reset(new LoginPerformer(this));
   login_performer_->LoginOffTheRecord();
   WizardAccessibilityHelper::GetInstance()->MaybeSpeak(
       l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_OFFRECORD).c_str(),
@@ skipping 68 matching lines @@
       ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED, error);
     } else if ((active_network && active_network->restricted_pool()) ||
                (failure.reason() == LoginFailure::NETWORK_AUTH_FAILED &&
                 failure.error().state() ==
                     GoogleServiceAuthError::SERVICE_UNAVAILABLE)) {
       // Use explicit captive portal state (restricted_pool()) or implicit one.
       // SERVICE_UNAVAILABLE is generated in 2 cases:
       // 1. ClientLogin returns ServiceUnavailable code.
       // 2. Internet connectivity may be behind the captive portal.
       // Suggesting user to try sign in to a portal in Guest mode.
-      if (UserCrosSettingsProvider::cached_allow_guest())
+      bool allow_guest;
+      user_settings_->GetBoolean(kAccountsPrefAllowGuest, &allow_guest);
+      if (allow_guest)
         ShowError(IDS_LOGIN_ERROR_CAPTIVE_PORTAL, error);
       else
         ShowError(IDS_LOGIN_ERROR_CAPTIVE_PORTAL_NO_GUEST_MODE, error);
     } else {
       if (!is_known_user)
         ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_NEW, error);
       else
         ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
     }
   }
@@ skipping 117 matching lines @@
     ActivateWizard(WizardController::kRegistrationScreenName);
   }
 
   if (login_status_consumer_)
     login_status_consumer_->OnOffTheRecordLoginSuccess();
 }
 
 void ExistingUserController::OnPasswordChangeDetected(
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
   // Must not proceed without signature verification.
-  bool trusted_setting_available = user_settings_->RequestTrustedOwner(
-      method_factory_.NewRunnableMethod(
-          &ExistingUserController::OnPasswordChangeDetected,
-          credentials));
+  bool trusted_setting_available = user_settings_->GetTrusted(
+      kDeviceOwner,
+      base::Bind(&ExistingUserController::OnPasswordChangeDetected,
+                 pointer_factory_.GetWeakPtr(),
+                 credentials));
   if (!trusted_setting_available) {
     // Value of owner email is still not verified.
     // Another attempt will be invoked after verification completion.
     return;
   }
 
   // Passing 'false' here enables "full sync" mode in the dialog,
   // which disables the requirement for the old owner password,
   // allowing us to recover from a lost owner password/homedir.
   // TODO(gspencer): We shouldn't have to erase stateful data when
@@ skipping 82 matching lines @@
       help_topic_id = login_performer_->login_timed_out() ?
           HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT_OFFLINE :
           HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT;
       break;
   }
 
   login_display_->ShowError(error_id, num_login_attempts_, help_topic_id);
 }
 
 void ExistingUserController::StartAutomaticFreeDiskSpaceControl() {
-  bool trusted_owner_available = user_settings_->RequestTrustedOwner(
-      method_factory_.NewRunnableMethod(
-          &ExistingUserController::StartAutomaticFreeDiskSpaceControl));
+  bool trusted_owner_available = user_settings_->GetTrusted(
+      kDeviceOwner,
+      base::Bind(&ExistingUserController::StartAutomaticFreeDiskSpaceControl,
+                 pointer_factory_.GetWeakPtr()));
   if (!trusted_owner_available) {
     // Value of owner email is still not verified.
     // Another attempt will be invoked after verification completion.
     return;
   }
   if (CrosLibrary::Get()->EnsureLoaded()) {
     CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
-    cryptohomed->AsyncSetOwnerUser(
-        UserCrosSettingsProvider::cached_owner(), NULL);
+    std::string owner;
+    user_settings_->GetString(kDeviceOwner, &owner);
+    cryptohomed->AsyncSetOwnerUser(owner, NULL);
     cryptohomed->AsyncDoAutomaticFreeDiskSpaceControl(NULL);
   }
 }
 
 }  // namespace chromeos