Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>.

content/renderer/usb/web_usb_client_impl.cc

 // Copyright 2015 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 "content/renderer/usb/web_usb_client_impl.h"
 
 #include <stddef.h>
+
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/move.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/mojo/type_converters.h"
 #include "content/child/scoped_web_callbacks.h"
 #include "content/public/common/service_registry.h"
 #include "content/renderer/usb/type_converters.h"
 #include "content/renderer/usb/web_usb_device_impl.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/WebKit/public/platform/WebCallbacks.h"
-#include "third_party/WebKit/public/platform/WebPassOwnPtr.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceFilter.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceRequestOptions.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBError.h"
 
 namespace content {
 
 namespace {
 
 const char kNoServiceError[] = "USB service unavailable.";
@@ skipping 16 matching lines @@
       callbacks,
       base::Bind(&RejectCallbacksWithError<CallbacksType>,
                  blink::WebUSBError(blink::WebUSBError::Error::NotFound,
                                     base::ASCIIToUTF16(kNoServiceError))));
 }
 
 void OnGetDevicesComplete(
     ScopedWebCallbacks<blink::WebUSBClientGetDevicesCallbacks> scoped_callbacks,
     device::usb::DeviceManager* device_manager,
     mojo::Array<device::usb::DeviceInfoPtr> results) {
-  blink::WebVector<blink::WebUSBDevice*>* devices =
-      new blink::WebVector<blink::WebUSBDevice*>(results.size());
+  // TODO(dcheng): This WebVector should hold smart pointers.
+  std::unique_ptr<blink::WebVector<blink::WebUSBDevice*>> devices(
+      new blink::WebVector<blink::WebUSBDevice*>(results.size()));
   for (size_t i = 0; i < results.size(); ++i) {
     device::usb::DevicePtr device;
     device_manager->GetDevice(results[i]->guid, mojo::GetProxy(&device));
     (*devices)[i] = new WebUSBDeviceImpl(
         std::move(device),
         mojo::ConvertTo<blink::WebUSBDeviceInfo>(results[i]));
   }
-  scoped_callbacks.PassCallbacks()->onSuccess(blink::adoptWebPtr(devices));
+  scoped_callbacks.PassCallbacks()->onSuccess(std::move(devices));
 }
 
 void OnRequestDevicesComplete(
     ScopedWebCallbacks<blink::WebUSBClientRequestDeviceCallbacks> callbacks,
     device::usb::DeviceManager* device_manager,
     device::usb::DeviceInfoPtr result) {
   auto scoped_callbacks = callbacks.PassCallbacks();
   if (result) {
     device::usb::DevicePtr device;
     device_manager->GetDevice(result->guid, mojo::GetProxy(&device));
-    blink::WebUSBDevice* web_usb_device = new WebUSBDeviceImpl(
-        std::move(device), mojo::ConvertTo<blink::WebUSBDeviceInfo>(result));
+    std::unique_ptr<blink::WebUSBDevice> web_usb_device(new WebUSBDeviceImpl(
+        std::move(device), mojo::ConvertTo<blink::WebUSBDeviceInfo>(result)));
 
-    scoped_callbacks->onSuccess(blink::adoptWebPtr(web_usb_device));
+    scoped_callbacks->onSuccess(std::move(web_usb_device));
   } else {
     scoped_callbacks->onError(
         blink::WebUSBError(blink::WebUSBError::Error::NotFound,
                            base::ASCIIToUTF16("No device selected.")));
   }
 }
 
 }  // namespace
 
 WebUSBClientImpl::WebUSBClientImpl(content::ServiceRegistry* service_registry)
@@ skipping 59 matching lines @@
     return;
 
   device_manager_->GetDeviceChanges(base::Bind(
       &WebUSBClientImpl::OnDeviceChangeNotification, base::Unretained(this)));
   for (size_t i = 0; i < notification->devices_added.size(); ++i) {
     const device::usb::DeviceInfoPtr& device_info =
         notification->devices_added[i];
     for (auto observer : observers_) {
       device::usb::DevicePtr device;
       device_manager_->GetDevice(device_info->guid, mojo::GetProxy(&device));
-      observer->onDeviceConnected(blink::adoptWebPtr(new WebUSBDeviceImpl(
+      observer->onDeviceConnected(base::WrapUnique(new WebUSBDeviceImpl(
           std::move(device),
           mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
     }
   }
   for (size_t i = 0; i < notification->devices_removed.size(); ++i) {
     const device::usb::DeviceInfoPtr& device_info =
         notification->devices_removed[i];
     for (auto observer : observers_)
-      observer->onDeviceDisconnected(blink::adoptWebPtr(new WebUSBDeviceImpl(
+      observer->onDeviceDisconnected(base::WrapUnique(new WebUSBDeviceImpl(
           nullptr, mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
   }
 }
 
 }  // namespace content