[Smart Lock] Extract the screenlock state to the proximity_auth component.

chrome/browser/signin/easy_unlock_service.h

 // Copyright 2014 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_SIGNIN_EASY_UNLOCK_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/signin/easy_unlock_auth_attempt.h"
 #include "chrome/browser/signin/easy_unlock_metrics.h"
 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/proximity_auth/screenlock_state.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
 #endif
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
@@ skipping 136 matching lines @@
   // returns false and |state| is unchanged.
   bool GetPersistedHardlockState(
       EasyUnlockScreenlockStateHandler::HardlockState* state) const;
 
   // Shows the hardlock or connecting state as initial UI before cryptohome
   // keys checking and state update from the app.
   void ShowInitialUserState();
 
   // Updates the user pod on the signin/lock screen for the user associated with
   // the service to reflect the provided screenlock state.
-  bool UpdateScreenlockState(EasyUnlockScreenlockStateHandler::State state);
+  bool UpdateScreenlockState(proximity_auth::ScreenlockState state);
 
   // Returns the screenlock state if it is available. Otherwise STATE_INACTIVE
   // is returned.
-  EasyUnlockScreenlockStateHandler::State GetScreenlockState();
+  proximity_auth::ScreenlockState GetScreenlockState();
 
   // Starts an auth attempt for the user associated with the service. The
   // attempt type (unlock vs. signin) will depend on the service type.
   void AttemptAuth(const std::string& user_id);
 
   // Similar to above but a callback is invoked after the auth attempt is
   // finalized instead of default unlock/sign-in.
   typedef EasyUnlockAuthAttempt::FinalizedCallback AttemptAuthCallback;
   void AttemptAuth(const std::string& user_id,
                    const AttemptAuthCallback& callback);
@@ skipping 159 matching lines @@
   bool tpm_key_checked_;
 
   ObserverList<EasyUnlockServiceObserver> observers_;
 
   base::WeakPtrFactory<EasyUnlockService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_