Added UserPolicySigninService::FetchPolicyForSignedInUser().

chrome/browser/policy/cloud_policy_service_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/policy/cloud_policy_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chrome/browser/policy/mock_cloud_policy_client.h"
 #include "chrome/browser/policy/mock_cloud_policy_store.h"
@@ skipping 15 matching lines @@
   MOCK_METHOD1(OnInitializationCompleted, void(CloudPolicyService* service));
  private:
   DISALLOW_COPY_AND_ASSIGN(MockCloudPolicyServiceObserver);
 };
 
 class CloudPolicyServiceTest : public testing::Test {
  public:
   CloudPolicyServiceTest()
       : service_(&client_, &store_) {}
 
-  MOCK_METHOD0(OnPolicyRefresh, void(void));
+  MOCK_METHOD1(OnPolicyRefresh, void(bool));
 
  protected:
   MockCloudPolicyClient client_;
   MockCloudPolicyStore store_;
   CloudPolicyService service_;
 };
 
 MATCHER_P(ProtoMatches, proto, "") {
   return arg.SerializePartialAsString() == proto.SerializePartialAsString();
 }
@@ skipping 36 matching lines @@
 
 TEST_F(CloudPolicyServiceTest, PolicyUpdateClientFailure) {
   client_.SetStatus(DM_STATUS_REQUEST_FAILED);
   EXPECT_CALL(store_, Store(_)).Times(0);
   client_.NotifyPolicyFetched();
 }
 
 TEST_F(CloudPolicyServiceTest, RefreshPolicySuccess) {
   testing::InSequence seq;
 
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
+  EXPECT_CALL(*this, OnPolicyRefresh(_)).Times(0);

[Mattias Nissler (ping if slow), 2012/12/07 15:20:45]

Hm, all these violate the "don't mix expectation setup with test code" gmock
rule. I guess I should fix this at some point.

[Andrew T Wilson (Slow), 2012/12/07 17:34:29]

What is that rule?

[Mattias Nissler (ping if slow), 2012/12/10 09:01:08]

From https://code.google.com/p/googlemock/wiki/ForDummies:
Important note: Google Mock requires expectations to be set before the mock
functions are called, otherwise the behavior is undefined. In particular, you
mustn't interleave EXPECT_CALL()s and calls to the mock functions.

It's OK again if you put a Mock::VerifyAndClearExpectations() before you
configure new expectations.

   client_.SetDMToken("fake token");
 
   // Trigger a fetch on the client.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // Client responds, push policy to store.
   em::PolicyFetchResponse policy;
   policy.set_policy_data("fake policy");
   client_.SetPolicy(policy);
   EXPECT_CALL(store_, Store(ProtoMatches(policy))).Times(1);
   client_.NotifyPolicyFetched();
 
   // Store reloads policy, callback gets triggered.
   store_.policy_.reset(new em::PolicyData());
   store_.policy_->set_request_token("token");
   store_.policy_->set_device_id("device-id");
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(1);
+  EXPECT_CALL(*this, OnPolicyRefresh(true)).Times(1);
   store_.NotifyStoreLoaded();
 }
 
 TEST_F(CloudPolicyServiceTest, RefreshPolicyNotRegistered) {
   // Clear the token so the client is not registered.
   client_.SetDMToken("");
 
   EXPECT_CALL(client_, FetchPolicy()).Times(0);
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(1);
+  EXPECT_CALL(*this, OnPolicyRefresh(false)).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 }
 
 TEST_F(CloudPolicyServiceTest, RefreshPolicyClientError) {
   testing::InSequence seq;
 
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
+  EXPECT_CALL(*this, OnPolicyRefresh(_)).Times(0);
   client_.SetDMToken("fake token");
 
   // Trigger a fetch on the client.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // Client responds with an error, which should trigger the callback.
   client_.SetStatus(DM_STATUS_REQUEST_FAILED);
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(1);
+  EXPECT_CALL(*this, OnPolicyRefresh(false)).Times(1);
   client_.NotifyClientError();
 }
 
 TEST_F(CloudPolicyServiceTest, RefreshPolicyStoreError) {
   testing::InSequence seq;
 
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
+  EXPECT_CALL(*this, OnPolicyRefresh(_)).Times(0);
   client_.SetDMToken("fake token");
 
   // Trigger a fetch on the client.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // Client responds, push policy to store.
   em::PolicyFetchResponse policy;
   policy.set_policy_data("fake policy");
   client_.SetPolicy(policy);
   EXPECT_CALL(store_, Store(ProtoMatches(policy))).Times(1);
   client_.NotifyPolicyFetched();
 
   // Store fails, which should trigger the callback.
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(1);
+  EXPECT_CALL(*this, OnPolicyRefresh(false)).Times(1);
   store_.NotifyStoreError();
 }
 
 TEST_F(CloudPolicyServiceTest, RefreshPolicyConcurrent) {
   testing::InSequence seq;
 
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
+  EXPECT_CALL(*this, OnPolicyRefresh(_)).Times(0);
   client_.SetDMToken("fake token");
 
   // Trigger a fetch on the client.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // Triggering another policy refresh should generate a new fetch request.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // Client responds, push policy to store.
   em::PolicyFetchResponse policy;
   policy.set_policy_data("fake policy");
   client_.SetPolicy(policy);
   EXPECT_CALL(store_, Store(ProtoMatches(policy))).Times(1);
   client_.NotifyPolicyFetched();
 
   // Trigger another policy fetch.
   EXPECT_CALL(client_, FetchPolicy()).Times(1);
   service_.RefreshPolicy(base::Bind(&CloudPolicyServiceTest::OnPolicyRefresh,
                                     base::Unretained(this)));
 
   // The store finishing the first load should not generate callbacks.
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
+  EXPECT_CALL(*this, OnPolicyRefresh(_)).Times(0);
   store_.NotifyStoreLoaded();
 
   // Second policy fetch finishes.
   EXPECT_CALL(store_, Store(ProtoMatches(policy))).Times(1);
   client_.NotifyPolicyFetched();
 
   // Corresponding store operation finishes, all _three_ callbacks fire.
-  EXPECT_CALL(*this, OnPolicyRefresh()).Times(3);
+  EXPECT_CALL(*this, OnPolicyRefresh(true)).Times(3);
   store_.NotifyStoreLoaded();
 }
 
 TEST_F(CloudPolicyServiceTest, StoreAlreadyInitialized) {
   // Service should start off initialized if the store has already loaded
   // policy.
   store_.NotifyStoreLoaded();
   CloudPolicyService service(&client_, &store_);
   EXPECT_TRUE(service.IsInitializationComplete());
 }
@@ skipping 11 matching lines @@
   testing::Mock::VerifyAndClearExpectations(&observer);
 
   // Now, the next time the store is loaded, the observer should not be called
   // again.
   EXPECT_CALL(observer, OnInitializationCompleted(&service_)).Times(0);
   store_.NotifyStoreLoaded();
   service_.RemoveObserver(&observer);
 }
 
 }  // namespace policy