Image writer client: create mojo client with MakeUnique<>

chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc

 // Copyright 2014 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/extensions/api/image_writer_private/image_writer_utility_client.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 54 matching lines @@
                                      const ErrorCallback& error_callback,
                                      const base::FilePath& source,
                                      const base::FilePath& target) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!removable_storage_writer_client_);
 
   progress_callback_ = progress_callback;
   success_callback_ = success_callback;
   error_callback_ = error_callback;
 
-  StartUtilityProcess();
+  StartUtilityProcessIfNeeded();
 
   extensions::mojom::RemovableStorageWriterClientPtr client;
   removable_storage_writer_client_ =
       base::MakeUnique<RemovableStorageWriterClientImpl>(this, &client);
 
   utility_process_mojo_client_->service()->Write(source, target,
                                                  std::move(client));
 }
 
 void ImageWriterUtilityClient::Verify(const ProgressCallback& progress_callback,
                                       const SuccessCallback& success_callback,
                                       const ErrorCallback& error_callback,
                                       const base::FilePath& source,
                                       const base::FilePath& target) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!removable_storage_writer_client_);
 
   progress_callback_ = progress_callback;
   success_callback_ = success_callback;
   error_callback_ = error_callback;
 
-  StartUtilityProcess();
+  StartUtilityProcessIfNeeded();
 
   extensions::mojom::RemovableStorageWriterClientPtr client;
   removable_storage_writer_client_ =
       base::MakeUnique<RemovableStorageWriterClientImpl>(this, &client);
 
   utility_process_mojo_client_->service()->Verify(source, target,
                                                   std::move(client));
 }
 
 void ImageWriterUtilityClient::Cancel(const CancelCallback& cancel_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   ResetRequest();
   task_runner_->PostTask(FROM_HERE, cancel_callback);
 }
 
 void ImageWriterUtilityClient::Shutdown() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   ResetRequest();
   utility_process_mojo_client_.reset();
 }
 
-void ImageWriterUtilityClient::StartUtilityProcess() {
+void ImageWriterUtilityClient::StartUtilityProcessIfNeeded() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   if (utility_process_mojo_client_)
     return;
 
-  const base::string16 utility_process_name =
-      l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_IMAGE_WRITER_NAME);
-
-  utility_process_mojo_client_.reset(
-      new content::UtilityProcessMojoClient<
-          extensions::mojom::RemovableStorageWriter>(utility_process_name));
+  utility_process_mojo_client_ =
+      base::MakeUnique<content::UtilityProcessMojoClient<
+          extensions::mojom::RemovableStorageWriter>>(
+          l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_IMAGE_WRITER_NAME));
   utility_process_mojo_client_->set_error_callback(
       base::Bind(&ImageWriterUtilityClient::UtilityProcessError, this));
 
   utility_process_mojo_client_->set_disable_sandbox();
 #if defined(OS_WIN)
   utility_process_mojo_client_->set_run_elevated();
 #endif
 
   utility_process_mojo_client_->Start();
 }
@@ skipping 25 matching lines @@
 }
 
 void ImageWriterUtilityClient::ResetRequest() {
   removable_storage_writer_client_.reset();
 
   // Clear handlers to not hold any reference to the caller.
   progress_callback_.Reset();
   success_callback_.Reset();
   error_callback_.Reset();
 }