| Index: chromeos/login/auth/authenticator.h
|
| diff --git a/chromeos/login/auth/authenticator.h b/chromeos/login/auth/authenticator.h
|
| index 7ae29b042c2bb8f2693d622117e0ad272a892070..d3fd5840f5d0f10cc8ad0711425163fab54dd24e 100644
|
| --- a/chromeos/login/auth/authenticator.h
|
| +++ b/chromeos/login/auth/authenticator.h
|
| @@ -13,9 +13,7 @@
|
| #include "chromeos/login/auth/auth_status_consumer.h"
|
| #include "google_apis/gaia/gaia_auth_consumer.h"
|
|
|
| -namespace content {
|
| -class BrowserContext;
|
| -}
|
| +class Profile;
|
|
|
| namespace chromeos {
|
|
|
| @@ -33,13 +31,13 @@
|
|
|
| // Given externally authenticated username and password (part of
|
| // |user_context|), this method attempts to complete authentication process.
|
| - virtual void CompleteLogin(content::BrowserContext* browser_context,
|
| + virtual void CompleteLogin(Profile* profile,
|
| const UserContext& user_context) = 0;
|
|
|
| // Given a user credentials in |user_context|,
|
| // this method attempts to authenticate to login.
|
| // Must be called on the UI thread.
|
| - virtual void AuthenticateToLogin(content::BrowserContext* browser_context,
|
| + virtual void AuthenticateToLogin(Profile* profile,
|
| const UserContext& user_context) = 0;
|
|
|
| // Given a user credentials in |user_context|, this method attempts to
|
| @@ -88,11 +86,9 @@
|
| // and create a new cryptohome.
|
| virtual void ResyncEncryptedData() = 0;
|
|
|
| - // BrowserContext (usually off the record) that was used to perform the last
|
| + // Profile (usually off the record ) that was used to perform the last
|
| // authentication process.
|
| - content::BrowserContext* authentication_context() {
|
| - return authentication_context_;
|
| - }
|
| + Profile* authentication_profile() { return authentication_profile_; }
|
|
|
| // Sets consumer explicitly.
|
| void SetConsumer(AuthStatusConsumer* consumer);
|
| @@ -101,7 +97,7 @@
|
| virtual ~Authenticator();
|
|
|
| AuthStatusConsumer* consumer_;
|
| - content::BrowserContext* authentication_context_;
|
| + Profile* authentication_profile_;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<Authenticator>;
|
|
|