Index: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
index 155e2e3732a78923a62eca261283dca34d82645f..135584602807e5e0fddca009fb56b68e18659922 100644 |
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
@@ -22,6 +22,7 @@ |
#include "base/test/test_simple_task_runner.h" |
#include "chrome/browser/chromeos/policy/device_local_account.h" |
#include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" |
+#include "chrome/browser/chromeos/policy/fake_affiliated_invalidation_service_provider.h" |
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
@@ -98,6 +99,8 @@ class DeviceLocalAccountPolicyServiceTestBase |
chromeos::CrosSettings cros_settings_; |
scoped_refptr<base::TestSimpleTaskRunner> extension_cache_task_runner_; |
MockDeviceManagementService mock_device_management_service_; |
+ FakeAffiliatedInvalidationServiceProvider |
+ affiliated_invalidation_service_provider_; |
scoped_ptr<DeviceLocalAccountPolicyService> service_; |
private: |
@@ -162,6 +165,7 @@ void DeviceLocalAccountPolicyServiceTestBase::CreatePolicyService() { |
&device_settings_test_helper_, |
&device_settings_service_, |
&cros_settings_, |
+ &affiliated_invalidation_service_provider_, |
base::MessageLoopProxy::current(), |
extension_cache_task_runner_, |
base::MessageLoopProxy::current(), |
@@ -231,6 +235,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, GetBroker) { |
EXPECT_EQ(CloudPolicyStore::STATUS_OK, broker->core()->store()->status()); |
EXPECT_FALSE(broker->core()->client()); |
EXPECT_FALSE(broker->core()->store()->policy_map().empty()); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
} |
TEST_F(DeviceLocalAccountPolicyServiceTest, LoadNoPolicy) { |
@@ -246,6 +251,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, LoadNoPolicy) { |
EXPECT_EQ(CloudPolicyStore::STATUS_LOAD_ERROR, |
broker->core()->store()->status()); |
EXPECT_TRUE(broker->core()->store()->policy_map().empty()); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_FALSE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -265,6 +271,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, LoadValidationFailure) { |
EXPECT_EQ(CloudPolicyStore::STATUS_VALIDATION_ERROR, |
broker->core()->store()->status()); |
EXPECT_TRUE(broker->core()->store()->policy_map().empty()); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_FALSE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -285,6 +292,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, LoadPolicy) { |
broker->core()->store()->policy()->SerializeAsString()); |
EXPECT_TRUE(expected_policy_map_.Equals( |
broker->core()->store()->policy_map())); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_TRUE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -311,6 +319,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, StoreValidationFailure) { |
broker->core()->store()->status()); |
EXPECT_EQ(CloudPolicyValidatorBase::VALIDATION_WRONG_POLICY_TYPE, |
broker->core()->store()->validation_status()); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_FALSE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -339,6 +348,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, StorePolicy) { |
broker->core()->store()->policy()->SerializeAsString()); |
EXPECT_TRUE(expected_policy_map_.Equals( |
broker->core()->store()->policy_map())); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_TRUE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -377,6 +387,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, DuplicateAccounts) { |
broker->core()->store()->policy()->SerializeAsString()); |
EXPECT_TRUE(expected_policy_map_.Equals( |
broker->core()->store()->policy_map())); |
+ EXPECT_FALSE(broker->HasInvalidatorForTest()); |
EXPECT_TRUE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -411,7 +422,6 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, FetchPolicy) { |
// This will be called twice, because the ComponentCloudPolicyService will |
// also become ready after flushing all the pending tasks. |
EXPECT_CALL(service_observer_, OnPolicyUpdated(account_1_user_id_)).Times(2); |
- broker->core()->client()->FetchPolicy(); |
FlushDeviceSettings(); |
Mock::VerifyAndClearExpectations(&service_observer_); |
Mock::VerifyAndClearExpectations(&mock_device_management_service_); |
@@ -446,6 +456,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, FetchPolicy) { |
broker->core()->store()->policy()->SerializeAsString()); |
EXPECT_TRUE(expected_policy_map_.Equals( |
broker->core()->store()->policy_map())); |
+ EXPECT_TRUE(broker->HasInvalidatorForTest()); |
EXPECT_TRUE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |
@@ -485,6 +496,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, RefreshPolicy) { |
broker->core()->store()->status()); |
EXPECT_TRUE(expected_policy_map_.Equals( |
broker->core()->store()->policy_map())); |
+ EXPECT_TRUE(broker->HasInvalidatorForTest()); |
EXPECT_TRUE(service_->IsPolicyAvailableForUser(account_1_user_id_)); |
} |