Index: chrome/browser/signin/signin_manager_fake.cc |
diff --git a/chrome/browser/signin/signin_manager_fake.cc b/chrome/browser/signin/signin_manager_fake.cc |
index 0e236588e7c86733cf0f194a661fe6e3a08b0a01..01d8867eabc4224ff70748a1babf6f208cea5be9 100644 |
--- a/chrome/browser/signin/signin_manager_fake.cc |
+++ b/chrome/browser/signin/signin_manager_fake.cc |
@@ -14,18 +14,18 @@ |
#include "chrome/common/pref_names.h" |
#include "content/public/browser/notification_service.h" |
-FakeSigninManager::FakeSigninManager(Profile* profile) |
+FakeSigninManagerBase::FakeSigninManagerBase(Profile* profile) |
: auth_in_progress_(false) { |
profile_ = profile; |
signin_global_error_.reset(new SigninGlobalError(this, profile)); |
GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError( |
signin_global_error_.get()); |
signin_allowed_.Init(prefs::kSigninAllowed, profile_->GetPrefs(), |
- base::Bind(&SigninManager::OnSigninAllowedPrefChanged, |
- base::Unretained(this))); |
+ base::Bind(&SigninManagerBase::OnSigninAllowedPrefChanged, |
+ base::Unretained(this))); |
} |
-FakeSigninManager::~FakeSigninManager() { |
+FakeSigninManagerBase::~FakeSigninManagerBase() { |
if (signin_global_error_.get()) { |
GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError( |
signin_global_error_.get()); |
@@ -33,6 +33,35 @@ FakeSigninManager::~FakeSigninManager() { |
} |
} |
+void FakeSigninManagerBase::SignOut() { |
+ authenticated_username_.clear(); |
+ content::NotificationService::current()->Notify( |
+ chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, |
+ content::Source<Profile>(profile_), |
+ content::NotificationService::NoDetails()); |
+} |
+ |
+bool FakeSigninManagerBase::AuthInProgress() const { |
+ return auth_in_progress_; |
+} |
+ |
+// static |
+ProfileKeyedService* FakeSigninManagerBase::Build(Profile* profile) { |
+ return new FakeSigninManagerBase(profile); |
+} |
+ |
+#if !defined (OS_CHROMEOS) |
+ |
+FakeSigninManager::FakeSigninManager(Profile* profile) { |
+ Initialize(profile); |
+} |
+ |
+FakeSigninManager::~FakeSigninManager() { |
+} |
+ |
+void FakeSigninManager::InitTokenService() { |
+} |
+ |
void FakeSigninManager::StartSignIn(const std::string& username, |
const std::string& password, |
const std::string& login_token, |
@@ -62,17 +91,9 @@ void FakeSigninManager::SignOut() { |
content::NotificationService::NoDetails()); |
} |
-void FakeSigninManager::ForceSignOut() { |
- // Allow signing out now. |
- prohibit_signout_ = false; |
- SignOut(); |
-} |
- |
-bool FakeSigninManager::AuthInProgress() const { |
- return auth_in_progress_; |
-} |
- |
// static |
ProfileKeyedService* FakeSigninManager::Build(Profile* profile) { |
return new FakeSigninManager(profile); |
} |
+ |
+#endif // !defined (OS_CHROMEOS) |