Merge 182705

chrome/browser/signin/signin_manager_fake.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/signin/signin_manager_fake.h"
 
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 28 matching lines @@
     const std::string& password) {
   SetAuthenticatedUsername(username);
 }
 
 void FakeSigninManager::StartSignInWithOAuth(const std::string& username,
                                              const std::string& password) {
   SetAuthenticatedUsername(username);
 }
 
 void FakeSigninManager::SignOut() {
+  if (IsSignoutProhibited())
+    return;
   authenticated_username_.clear();
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
       content::Source<Profile>(profile_),
       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);
 }