Signed settings refactoring: Proper caching and more tests.

chrome/browser/policy/enterprise_metrics_browsertest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/thread.h"
@@ skipping 678 matching lines @@
 
   void ExpectInstallAttributes() {
     install_attributes_.ExpectUsage();
   }
 
   void ExpectMockSignedSettings(chromeos::SignedSettings::ReturnCode code,
                                 int expected_retrieves) {
     install_attributes_.ExpectUsage();
     EXPECT_CALL(mock_signed_settings_helper_, StartStorePolicyOp(_, _))
         .WillOnce(MockSignedSettingsHelperStorePolicy(code));
-    EXPECT_CALL(mock_signed_settings_helper_, CancelCallback(_))
-        .Times(1)
-        .RetiresOnSaturation();
     EXPECT_CALL(mock_signed_settings_helper_,
                 StartRetrievePolicyOp(_)).Times(expected_retrieves);
   }
 
   const em::PolicyFetchResponse& response() {
     return response_;
   }
 
  private:
   void Init() {
     data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
     device_policy_cache_.reset(new DevicePolicyCache(data_store_.get(),
                                install_attributes_.install_attributes(),
                                &mock_signed_settings_helper_));
     data_store_->SetupForTesting("", "id", "user", "gaia_token", false);
-    EXPECT_CALL(mock_signed_settings_helper_, CancelCallback(_)).Times(1);
   }
 
   chromeos::MockSignedSettingsHelper mock_signed_settings_helper_;
   scoped_ptr<CloudPolicyDataStore> data_store_;
   scoped_ptr<DevicePolicyCache> device_policy_cache_;
   em::PolicyFetchResponse response_;
   TestInstallAttributes install_attributes_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCacheTestHelper);
 };
@@ skipping 134 matching lines @@
   helper.CompleteRetrieve(chromeos::SignedSettings::NOT_FOUND);
   helper.SetData("\xff");
   helper.SetPolicy();
   ExpectSample(kMetricPolicyFetchInvalidPolicy);
   EXPECT_TRUE(CheckSamples());
 }
 
 #endif
 
 }  // namespace policy