Convert device to std::unique_ptr

device/test/usb_test_gadget_impl.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 "device/test/usb_test_gadget.h"
-
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "device/core/device_client.h"
+#include "device/test/usb_test_gadget.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_handle.h"
 #include "device/usb/usb_service.h"
 #include "net/base/escape.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 76 matching lines @@
 }
 
 bool ReadLocalPackage(std::string* package) {
   base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_EXE, &file_path));
   file_path = file_path.AppendASCII("usb_gadget.zip");
 
   return ReadFile(file_path, package);
 }
 
-scoped_ptr<net::URLFetcher> CreateURLFetcher(
+std::unique_ptr<net::URLFetcher> CreateURLFetcher(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     const GURL& url,
     net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* delegate) {
-  scoped_ptr<net::URLFetcher> url_fetcher =
+  std::unique_ptr<net::URLFetcher> url_fetcher =
       net::URLFetcher::Create(url, request_type, delegate);
 
   url_fetcher->SetRequestContext(request_context_getter.get());
 
   return url_fetcher;
 }
 
 class URLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   URLRequestContextGetter(
@@ skipping 11 matching lines @@
       context_ = context_builder.Build();
     }
     return context_.get();
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override {
     return network_task_runner_;
   }
 
-  scoped_ptr<net::URLRequestContext> context_;
+  std::unique_ptr<net::URLRequestContext> context_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 };
 
 class URLFetcherDelegate : public net::URLFetcherDelegate {
  public:
   URLFetcherDelegate() {}
   ~URLFetcherDelegate() override {}
 
   void WaitForCompletion() { run_loop_.Run(); }
 
   void OnURLFetchComplete(const net::URLFetcher* source) override {
     run_loop_.Quit();
   }
 
  private:
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(URLFetcherDelegate);
 };
 
 int SimplePOSTRequest(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     const GURL& url,
     const std::string& form_data) {
   URLFetcherDelegate delegate;
-  scoped_ptr<net::URLFetcher> url_fetcher = CreateURLFetcher(
+  std::unique_ptr<net::URLFetcher> url_fetcher = CreateURLFetcher(
       request_context_getter, url, net::URLFetcher::POST, &delegate);
 
   url_fetcher->SetUploadData("application/x-www-form-urlencoded", form_data);
   url_fetcher->Start();
   delegate.WaitForCompletion();
 
   return url_fetcher->GetResponseCode();
 }
 
 class UsbGadgetFactory : public UsbService::Observer,
                          public net::URLFetcherDelegate {
  public:
   UsbGadgetFactory(scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
       : observer_(this), weak_factory_(this) {
     usb_service_ = DeviceClient::Get()->GetUsbService();
     request_context_getter_ = new URLRequestContextGetter(io_task_runner);
 
     static uint32_t next_session_id;
     base::ProcessId process_id = base::GetCurrentProcId();
     session_id_ = base::StringPrintf("%d-%d", process_id, next_session_id++);
 
     observer_.Add(usb_service_);
   }
 
   ~UsbGadgetFactory() override {}
 
-  scoped_ptr<UsbTestGadget> WaitForDevice() {
+  std::unique_ptr<UsbTestGadget> WaitForDevice() {
     EnumerateDevices();
     run_loop_.Run();
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new UsbTestGadgetImpl(request_context_getter_, usb_service_, device_));
   }
 
  private:
   void EnumerateDevices() {
     if (!device_) {
       usb_service_->GetDevices(base::Bind(
           &UsbGadgetFactory::OnDevicesEnumerated, weak_factory_.GetWeakPtr()));
     }
   }
@@ skipping 149 matching lines @@
     // Wait a bit and then try again to find an available device.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&UsbGadgetFactory::EnumerateDevices,
                               weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kReenumeratePeriod));
   }
 
   UsbService* usb_service_ = nullptr;
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::string session_id_;
-  scoped_ptr<net::URLFetcher> url_fetcher_;
+  std::unique_ptr<net::URLFetcher> url_fetcher_;
   scoped_refptr<UsbDevice> device_;
   std::string serial_number_;
   bool claimed_ = false;
   std::string version_;
   base::RunLoop run_loop_;
   ScopedObserver<UsbService, UsbService::Observer> observer_;
   base::WeakPtrFactory<UsbGadgetFactory> weak_factory_;
 };
 
 class DeviceAddListener : public UsbService::Observer {
@@ skipping 112 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DeviceRemoveListener);
 };
 
 }  // namespace
 
 bool UsbTestGadget::IsTestEnabled() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(kCommandLineSwitch);
 }
 
-scoped_ptr<UsbTestGadget> UsbTestGadget::Claim(
+std::unique_ptr<UsbTestGadget> UsbTestGadget::Claim(
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
   UsbGadgetFactory gadget_factory(io_task_runner);
   return gadget_factory.WaitForDevice();
 }
 
 UsbTestGadgetImpl::UsbTestGadgetImpl(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter_,
     UsbService* usb_service,
     scoped_refptr<UsbDevice> device)
     : device_address_(base::UTF16ToUTF8(device->serial_number())),
@@ skipping 78 matching lines @@
     return false;
   }
 
   DeviceAddListener add_listener(usb_service_, device_address_, -1);
   device_ = add_listener.WaitForAdd();
   DCHECK(device_.get());
   return true;
 }
 
 }  // namespace device