Index: chrome/browser/policy/user_policy_cache_unittest.cc |
diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc |
index b6b6c5f6d7e0b0412ee14a5a37c449b8c89df2fe..50095d89d9f3ad4f730f33513b16ad1ae2318293 100644 |
--- a/chrome/browser/policy/user_policy_cache_unittest.cc |
+++ b/chrome/browser/policy/user_policy_cache_unittest.cc |
@@ -103,16 +103,15 @@ class UserPolicyCacheTest : public testing::Test { |
// Takes ownership of |policy_response|. |
void SetPolicy(UserPolicyCache* cache, |
em::PolicyFetchResponse* policy_response) { |
- scoped_ptr<em::PolicyFetchResponse> policy(policy_response); |
- cache->SetReady(); |
- cache->AddObserver(&observer); |
- |
- EXPECT_CALL(observer, OnCacheUpdate(_)).Times(1); |
+ EXPECT_CALL(observer_, OnCacheUpdate(_)).Times(1); |
+ cache->AddObserver(&observer_); |
+ scoped_ptr<em::PolicyFetchResponse> policy(policy_response); |
cache->SetPolicy(*policy); |
- testing::Mock::VerifyAndClearExpectations(&observer); |
+ cache->SetReady(); |
+ testing::Mock::VerifyAndClearExpectations(&observer_); |
- cache->RemoveObserver(&observer); |
+ cache->RemoveObserver(&observer_); |
} |
void SetReady(UserPolicyCache* cache) { |
@@ -132,7 +131,7 @@ class UserPolicyCacheTest : public testing::Test { |
} |
MessageLoop loop_; |
- MockCloudPolicyCacheBaseObserver observer; |
+ MockCloudPolicyCacheBaseObserver observer_; |
private: |
ScopedTempDir temp_dir_; |
@@ -359,19 +358,19 @@ TEST_F(UserPolicyCacheTest, FreshPolicyOverride) { |
TEST_F(UserPolicyCacheTest, SetReady) { |
UserPolicyCache cache(test_file(), false /* wait_for_policy_fetch */); |
- cache.AddObserver(&observer); |
+ cache.AddObserver(&observer_); |
scoped_ptr<em::PolicyFetchResponse> policy( |
CreateHomepagePolicy("http://www.example.com", |
base::Time::NowFromSystemTime(), |
em::PolicyOptions::MANDATORY)); |
- EXPECT_CALL(observer, OnCacheUpdate(_)).Times(0); |
+ EXPECT_CALL(observer_, OnCacheUpdate(_)).Times(0); |
cache.SetPolicy(*policy); |
- testing::Mock::VerifyAndClearExpectations(&observer); |
+ testing::Mock::VerifyAndClearExpectations(&observer_); |
// Switching the cache to ready should send a notification. |
- EXPECT_CALL(observer, OnCacheUpdate(_)).Times(1); |
+ EXPECT_CALL(observer_, OnCacheUpdate(_)).Times(1); |
SetReady(&cache); |
- cache.RemoveObserver(&observer); |
+ cache.RemoveObserver(&observer_); |
} |
// Test case for the temporary support for GenericNamedValues in the |