| 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 66002748c524ae91c2012aeeaeed2ea122635b43..5c5fdcbca4842f2d34d62bd927cc5b88c8acb1fb 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
|
| @@ -121,8 +121,9 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, FreshDevice) {
|
| FlushDeviceSettings();
|
| EXPECT_TRUE(manager_.IsInitializationComplete(POLICY_DOMAIN_CHROME));
|
|
|
| - manager_.Connect(&local_state_, &device_management_service_,
|
| - scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
|
| + manager_.Connect(&local_state_,
|
| + &device_management_service_,
|
| + scoped_ptr<CloudPolicyClient::StatusProvider>());
|
|
|
| PolicyBundle bundle;
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
| @@ -150,8 +151,9 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {
|
| Value::CreateBooleanValue(false));
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
|
|
| - manager_.Connect(&local_state_, &device_management_service_,
|
| - scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
|
| + manager_.Connect(&local_state_,
|
| + &device_management_service_,
|
| + scoped_ptr<CloudPolicyClient::StatusProvider>());
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
|
|
| manager_.Shutdown();
|
| @@ -166,8 +168,9 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConsumerDevice) {
|
| PolicyBundle bundle;
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
|
|
| - manager_.Connect(&local_state_, &device_management_service_,
|
| - scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
|
| + manager_.Connect(&local_state_,
|
| + &device_management_service_,
|
| + scoped_ptr<CloudPolicyClient::StatusProvider>());
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
|
|
| manager_.Shutdown();
|
| @@ -219,8 +222,9 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
|
| PolicyBundle bundle;
|
| EXPECT_TRUE(manager_.policies().Equals(bundle));
|
|
|
| - manager_.Connect(&local_state_, &device_management_service_,
|
| - scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
|
| + manager_.Connect(&local_state_,
|
| + &device_management_service_,
|
| + scoped_ptr<CloudPolicyClient::StatusProvider>());
|
| }
|
|
|
| void ExpectFailedEnrollment(EnrollmentStatus::Status status) {
|
|
|