Refactored device status uploading out of policy fetch infrastructure.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 64d0183970bc0643dcca664d690ada68e5b26755..625ddfd04eb48d08c9219355d391a7187fe10938 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -83,10 +83,6 @@ class TestingDeviceCloudPolicyManagerChromeOS
       : DeviceCloudPolicyManagerChromeOS(
             store.Pass(), task_runner, state_keys_broker) {}
   ~TestingDeviceCloudPolicyManagerChromeOS() override {}
-
-  bool HasStatusProvider() {
-    return client() ? client()->HasStatusProviderForTest() : false;
-  }
 };
 
 class DeviceCloudPolicyManagerChromeOSTest
@@ -256,7 +252,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {
   Mock::VerifyAndClearExpectations(&device_management_service_);
   ASSERT_TRUE(policy_fetch_job);
   // Should create a status provider for reporting on enrolled devices.
-  EXPECT_TRUE(manager_->HasStatusProvider());
+  EXPECT_TRUE(manager_->HasStatusUploaderForTest());
   VerifyPolicyPopulated();
 
   manager_->Shutdown();
@@ -294,7 +290,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, UnmanagedDevice) {
   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);
@@ -322,7 +318,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConsumerDevice) {
   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));