Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4318)

Unified Diff: chrome/browser/policy/user_policy_signin_service_unittest.cc

Issue 10834262: Enabled SignInAfterInit test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/signin/token_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc
index fc3d3fa8b514363eccfd780eeb6b8f2ce76bc23b..ae7e35e2fe2a1a8f059d897c6c8e4964e1c64b77 100644
--- a/chrome/browser/policy/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc
@@ -12,7 +12,10 @@
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/signin_manager_fake.h"
+#include "chrome/browser/signin/token_service.h"
+#include "chrome/browser/signin/token_service_factory.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_pref_service.h"
@@ -54,6 +57,7 @@ class UserPolicySigninServiceTest : public testing::Test {
TestingProfile::Builder builder;
builder.SetUserCloudPolicyManager(manager.Pass());
profile_ = builder.Build().Pass();
+ profile_->CreateRequestContext();
profile_->GetPrefs()->SetBoolean(prefs::kLoadCloudPolicyOnSignin, true);
SigninManagerFactory::GetInstance()->SetTestingFactory(
profile_.get(), FakeSigninManager::Build);
@@ -113,9 +117,7 @@ TEST_F(UserPolicySigninServiceTest, InitWhileSignedIn) {
ASSERT_TRUE(profile_->GetUserCloudPolicyManager()->cloud_policy_service());
}
-// TODO(atwilson): Enable test for signing in once it is possible to use a
-// mock TokenService (http://crbug.com/138618).
-TEST_F(UserPolicySigninServiceTest, DISABLED_SignInAfterInit) {
+TEST_F(UserPolicySigninServiceTest, SignInAfterInit) {
// Let the SigninService know that the profile has been created.
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_PROFILE_ADDED,
@@ -129,7 +131,9 @@ TEST_F(UserPolicySigninServiceTest, DISABLED_SignInAfterInit) {
SigninManagerFactory::GetForProfile(profile_.get())->SetAuthenticatedUsername(
"testuser@test.com");
- // Make oauth token available (needs MockTokenService - see TODO above).
+ // Make oauth token available.
+ TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
+ GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth_login_refresh_token");
// UserCloudPolicyManager should be initialized.
ASSERT_TRUE(profile_->GetUserCloudPolicyManager()->cloud_policy_service());
« no previous file with comments | « no previous file | chrome/browser/signin/token_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698