Merge 182705

chrome/browser/signin/signin_manager_unittest.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
@@ skipping 636 matching lines @@
 
   manager_->ProvideOAuthChallengeResponse(
       GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "solution");
 
   SimulateProvideOAuthChallengeResponseValid();
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 
   EXPECT_EQ(1U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 }
+
+TEST_F(SigninManagerTest, SignOutWhileProhibited) {
+  manager_->Initialize(profile_.get());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+
+  manager_->SetAuthenticatedUsername("user@gmail.com");
+  manager_->ProhibitSignout();
+  manager_->SignOut();
+  EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
+}