Chromium Code Reviews| Index: chrome/browser/policy/device_management_policy_provider_unittest.cc |
| diff --git a/chrome/browser/policy/device_management_policy_provider_unittest.cc b/chrome/browser/policy/device_management_policy_provider_unittest.cc |
| index bd27e48683303cf27c7586b1e473ab355384f0af..8ff0d8f35efff6309877dca619bbdc7a08ee0f63 100644 |
| --- a/chrome/browser/policy/device_management_policy_provider_unittest.cc |
| +++ b/chrome/browser/policy/device_management_policy_provider_unittest.cc |
| @@ -14,6 +14,8 @@ |
| #include "chrome/common/notification_service.h" |
| #include "chrome/common/policy_constants.h" |
| #include "chrome/test/mock_notification_observer.h" |
| +#include "chrome/test/testing_device_token_fetcher.h" |
| +#include "chrome/test/testing_profile.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| const char kTestToken[] = "device_policy_provider_test_auth_token"; |
| @@ -33,6 +35,7 @@ class DeviceManagementPolicyProviderTest : public testing::Test { |
| virtual void SetUp() { |
| EXPECT_TRUE(storage_dir_.CreateUniqueTempDir()); |
| + profile_.reset(new TestingProfile); |
| CreateNewBackend(); |
| CreateNewProvider(); |
| } |
| @@ -43,19 +46,24 @@ class DeviceManagementPolicyProviderTest : public testing::Test { |
| } |
| void CreateNewProvider() { |
| - token_service_.reset(new TokenService); |
| provider_.reset(new DeviceManagementPolicyProvider( |
| ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(), |
| backend_, |
| - token_service_.get(), |
| - storage_dir_.path())); |
| + profile_.get(), |
| + new TestingDeviceTokenFetcher(backend_, |
| + profile_.get(), |
| + storage_dir_.path()))); |
| loop_.RunAllPending(); |
| } |
| void SimulateSuccessfulLoginAndRunPending() { |
| loop_.RunAllPending(); |
| - token_service_->IssueAuthTokenForTest( |
| + profile_->GetTokenService()->IssueAuthTokenForTest( |
| GaiaConstants::kDeviceManagementService, kTestToken); |
| + TestingDeviceTokenFetcher* fetcher = |
| + static_cast<TestingDeviceTokenFetcher*> ( |
|
Mattias Nissler (ping if slow)
2010/11/22 20:36:08
No space before (
gfeher
2010/11/23 13:47:51
Done.
|
| + provider_->token_fetcher_.get()); |
| + fetcher->SimulateLogin(kTestDasherDomainUsername); |
| loop_.RunAllPending(); |
| } |
| @@ -85,7 +93,7 @@ class DeviceManagementPolicyProviderTest : public testing::Test { |
| BrowserThread ui_thread_; |
| BrowserThread file_thread_; |
| ScopedTempDir storage_dir_; |
| - scoped_ptr<TokenService> token_service_; |
| + scoped_ptr<Profile> profile_; |
| DISALLOW_COPY_AND_ASSIGN(DeviceManagementPolicyProviderTest); |
| }; |