Remove AsyncSetOwnerUser() from cryptohome library

chrome/browser/chromeos/login/existing_user_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/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.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/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
@@ skipping 276 matching lines @@
     ShowEnrollmentScreen(true, username);
   } else {
     CompleteLoginInternal(username, password);
   }
 }
 
 void ExistingUserController::CompleteLoginInternal(std::string username,
                                                    std::string password) {
   resume_login_callback_.Reset();
 
-  SetOwnerUserInCryptohome();
-
   GaiaAuthConsumer::ClientLoginResult credentials;
   if (!login_performer_.get()) {
     LoginPerformer::Delegate* delegate = this;
     if (login_performer_delegate_.get())
       delegate = login_performer_delegate_.get();
     // Only one instance of LoginPerformer should exist at a time.
     login_performer_.reset(new LoginPerformer(delegate));
   }
 
   // If the device is not owned yet, successfully logged in user will be owner.
@@ skipping 42 matching lines @@
   is_login_in_progress_ = true;
   login_performer_->Login(username, password);
   accessibility::MaybeSpeak(
       l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNING_IN));
 }
 
 void ExistingUserController::LoginAsGuest() {
   SetStatusAreaEnabled(false);
   // Disable clicking on other windows.
   login_display_->SetUIEnabled(false);
-  SetOwnerUserInCryptohome();
 
   // Check allow_guest in case this call is fired from key accelerator.
   // Must not proceed without signature verification.
   bool trusted_setting_available = cros_settings_->GetTrusted(
       kAccountsPrefAllowGuest,
       base::Bind(&ExistingUserController::LoginAsGuest,
                  weak_factory_.GetWeakPtr()));
   if (!trusted_setting_available) {
     // Value of AllowGuest setting is still not verified.
     // Another attempt will be invoked again after verification completion.
@@ skipping 382 matching lines @@
     default:
       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::SetOwnerUserInCryptohome() {
-  bool trusted_owner_available = cros_settings_->GetTrusted(
-      kDeviceOwner,
-      base::Bind(&ExistingUserController::SetOwnerUserInCryptohome,
-                 weak_factory_.GetWeakPtr()));
-  if (!trusted_owner_available) {
-    // Value of owner email is still not verified.
-    // Another attempt will be invoked after verification completion.
-    return;
-  }
-  CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
-  std::string owner;
-  cros_settings_->GetString(kDeviceOwner, &owner);
-  cryptohomed->AsyncSetOwnerUser(owner, NULL);
-
-  // Do not invoke AsyncDoAutomaticFreeDiskSpaceControl(NULL) here
-  // so it does not delay the following mount. Cleanup will be
-  // started in Cryptohomed by timer.
-}
-
 void ExistingUserController::ShowGaiaPasswordChanged(
     const std::string& username) {
   // Invalidate OAuth token, since it can't be correct after password is
   // changed.
   UserManager::Get()->SaveUserOAuthStatus(username,
                                           User::OAUTH_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   SetStatusAreaEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos