Make CloudPolicyValidator memory management clearer

chrome/browser/chromeos/settings/session_manager_operation.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/settings/session_manager_operation.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 147 matching lines @@
   }
 
   base::SequencedWorkerPool* pool =
       content::BrowserThread::GetBlockingPool();
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
       pool->GetSequencedTaskRunnerWithShutdownBehavior(
           pool->GetSequenceToken(),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 
   std::unique_ptr<policy::DeviceCloudPolicyValidator> validator =
-      base::WrapUnique<policy::DeviceCloudPolicyValidator>(
-          policy::DeviceCloudPolicyValidator::Create(std::move(policy),
-                                                     background_task_runner));
+      policy::DeviceCloudPolicyValidator::Create(std::move(policy),
+                                                 background_task_runner);
 
   if (cloud_validations_) {
     // Policy auto-generated by session manager doesn't include a timestamp, so
     // the timestamp shouldn't be verified in that case.
     //
     // Additionally, offline devices can get their clock set backwards in time
     // under some hardware conditions; checking the timestamp now could likely
     // find a value in the future, and prevent the user from signing-in or
     // starting guest mode. Tlsdate will eventually fix the clock when the
     // device is back online, but the network configuration may come from device
@@ skipping 18 matching lines @@
     // key is validated when it is installed.
     validator->ValidateSignature(public_key_->as_string());
   }
 
   validator->ValidatePolicyType(policy::dm_protocol::kChromeDevicePolicyType);
   validator->ValidatePayload();
   if (force_immediate_load_) {
     validator->RunValidation();
     ReportValidatorStatus(validator.get());
   } else {
-    // The Validator will delete itself once validation is complete.
-    validator.release()->StartValidation(
+    policy::DeviceCloudPolicyValidator::StartValidation(
+        std::move(validator),
         base::Bind(&SessionManagerOperation::ReportValidatorStatus,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
 void SessionManagerOperation::ReportValidatorStatus(
     policy::DeviceCloudPolicyValidator* validator) {
   DeviceSettingsService::Status status =
       DeviceSettingsService::STORE_VALIDATION_ERROR;
   if (validator->success()) {
@@ skipping 52 matching lines @@
 }
 
 void StoreSettingsOperation::HandleStoreResult(bool success) {
   if (!success)
     ReportResult(DeviceSettingsService::STORE_OPERATION_FAILED);
   else
     StartLoading();
 }
 
 }  // namespace chromeos