Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/parallel_authenticator.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
-#include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/online_attempt.h"
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 
 class LoginFailure;
 class Profile;
 
 namespace chromeos {
 
 class LoginStatusConsumer;
 
 // Authenticates a Chromium OS user against the Google Accounts ClientLogin API.
@@ skipping 182 matching lines @@
   void LoadSystemSalt();
   // If we don't have supplemental_user_key_ yet, loads it from the NSS DB.
   // Returns false if the key can not be loaded/created.
   bool LoadSupplementalUserKey();
 
   // checks if the current mounted home contains the owner case and either
   // continues or fails the log-in. Used for policy lost mitigation "safe-mode".
   // Returns true if the owner check has been successful or if it is not needed.
   bool VerifyOwner();
 
-  // Handles completion of the ownership check and continues login.
-  void OnOwnershipChecked(DeviceSettingsService::OwnershipStatus status,
-                          bool is_owner);
+  // checks if the current mounted home contains the owner case and either
+  // continues or fails the log-in. Used for policy lost mitigation "safe-mode".
+  void FinishVerifyOwnerOnFileThread();
 
   // Records OAuth1 access token verification failure for |user_account|.
   void RecordOAuthCheckFailure(const std::string& user_account);
 
   // Signal login completion status for cases when a new user is added via
   // an external authentication provider (i.e. GAIA extension).
   void ResolveLoginCompletionStatus();
 
   // Used when we need to try online authentication again, after successful
   // mount, but failed online login.
@@ skipping 10 matching lines @@
   // be able to mount her cryptohome, but online authentication will fail.
   // This allows us to present the same behavior to the caller, regardless
   // of the order in which we receive these results.
   bool already_reported_success_;
   base::Lock success_lock_;  // A lock around |already_reported_success_|.
 
   // Flags signaling whether the owner verification has been done and the result
   // of it.
   bool owner_is_verified_;
   bool user_can_login_;
+  // A lock for |owner_is_verified_| and |user_can_login_|.
+  base::Lock owner_verified_lock_;
 
   // True if we use OAuth-based authentication flow.
   bool using_oauth_;
 
   DISALLOW_COPY_AND_ASSIGN(ParallelAuthenticator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_