Refactored device status uploading out of policy fetch infrastructure.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_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/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 65 matching lines @@
 class TestingDeviceCloudPolicyManagerChromeOS
     : public DeviceCloudPolicyManagerChromeOS {
  public:
   TestingDeviceCloudPolicyManagerChromeOS(
       scoped_ptr<DeviceCloudPolicyStoreChromeOS> store,
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       ServerBackedStateKeysBroker* state_keys_broker)
       : DeviceCloudPolicyManagerChromeOS(
             store.Pass(), task_runner, state_keys_broker) {}
   ~TestingDeviceCloudPolicyManagerChromeOS() override {}
-
-  bool HasStatusProvider() {
-    return client() ? client()->HasStatusProviderForTest() : false;
-  }
 };
 
 class DeviceCloudPolicyManagerChromeOSTest
     : public chromeos::DeviceSettingsTestBase,
       public DeviceCloudPolicyManagerChromeOS::Observer {
  protected:
   DeviceCloudPolicyManagerChromeOSTest()
       : fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
         state_keys_broker_(&fake_session_manager_client_,
                            base::MessageLoopProxy::current()),
@@ skipping 148 matching lines @@
   EXPECT_CALL(device_management_service_,
               CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH, _))
       .Times(AtMost(1))
       .WillOnce(device_management_service_.CreateAsyncJob(&policy_fetch_job));
   EXPECT_CALL(device_management_service_, StartJob(_, _, _, _, _, _, _))
       .Times(AtMost(1));
   ConnectManager();
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&device_management_service_);
   ASSERT_TRUE(policy_fetch_job);
-  // Should create a status provider for reporting on enrolled devices.
-  EXPECT_TRUE(manager_->HasStatusProvider());
+  // Should create a status uploader for reporting on enrolled devices.
+  EXPECT_TRUE(manager_->HasStatusUploaderForTest());
   VerifyPolicyPopulated();
 
   manager_->Shutdown();
   VerifyPolicyPopulated();
 
   EXPECT_EQ(store_->policy()->service_account_identity(),
             PolicyBuilder::kFakeServiceAccountIdentity);
 }
 
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, UnmanagedDevice) {
@@ skipping 17 matching lines @@
       .Times(AtMost(1))
       .WillOnce(device_management_service_.CreateAsyncJob(&policy_fetch_job));
   EXPECT_CALL(device_management_service_, StartJob(_, _, _, _, _, _, _))
       .Times(AtMost(1));
   ConnectManager();
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&device_management_service_);
   ASSERT_TRUE(policy_fetch_job);
   // Should create a status provider for reporting on enrolled devices, even
   // those that aren't managed.
-  EXPECT_TRUE(manager_->HasStatusProvider());
+  EXPECT_TRUE(manager_->HasStatusUploaderForTest());
 
   // Switch back to ACTIVE, service the policy fetch and let it propagate.
   device_policy_.policy_data().set_state(em::PolicyData::ACTIVE);
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   em::DeviceManagementResponse policy_fetch_response;
   policy_fetch_response.mutable_policy_response()->add_response()->CopyFrom(
       device_policy_.policy());
   policy_fetch_job->SendResponse(DM_STATUS_SUCCESS, policy_fetch_response);
   FlushDeviceSettings();
 
   // Policy state should now be active and the policy map should be populated.
   EXPECT_TRUE(store_->is_managed());
   VerifyPolicyPopulated();
 }
 
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConsumerDevice) {
   FlushDeviceSettings();
   EXPECT_EQ(CloudPolicyStore::STATUS_BAD_STATE, store_->status());
   EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
 
   PolicyBundle bundle;
   EXPECT_TRUE(manager_->policies().Equals(bundle));
 
   ConnectManager();
   EXPECT_TRUE(manager_->policies().Equals(bundle));
   // Should not create a status provider for reporting on consumer devices.
-  EXPECT_FALSE(manager_->HasStatusProvider());
+  EXPECT_FALSE(manager_->HasStatusUploaderForTest());
 
   manager_->Shutdown();
   EXPECT_TRUE(manager_->policies().Equals(bundle));
 }
 
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConnectAndDisconnect) {
   LockDevice();
   FlushDeviceSettings();
   EXPECT_FALSE(manager_->core()->service());  // Not connected.
 
@@ skipping 389 matching lines @@
 
 TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentBlankSystemSaltTest,
        RobotRefreshSaveFailed) {
   // Without the system salt, the robot token can't be stored.
   RunTest();
   ExpectFailedEnrollment(EnrollmentStatus::STATUS_ROBOT_REFRESH_STORE_FAILED);
 }
 
 }  // namespace
 }  // namespace policy