[Extensions] Convert APIs to use movable types [13]

extensions/browser/api/serial/serial_api.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 "extensions/browser/api/serial/serial_api.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/values.h"
@@ skipping 72 matching lines @@
   return true;
 }
 
 void SerialGetDevicesFunction::Work() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
       device::SerialDeviceEnumerator::Create();
   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
   results_ = serial::GetDevices::Results::Create(
-      devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
+      devices.To<std::vector<serial::DeviceInfo>>());
 }
 
 SerialConnectFunction::SerialConnectFunction() {
 }
 
 SerialConnectFunction::~SerialConnectFunction() {
 }
 
 bool SerialConnectFunction::Prepare() {
   params_ = serial::Connect::Params::Create(*args_);
@@ skipping 239 matching lines @@
 }
 
 SerialGetConnectionsFunction::~SerialGetConnectionsFunction() {
 }
 
 bool SerialGetConnectionsFunction::Prepare() {
   return true;
 }
 
 void SerialGetConnectionsFunction::Work() {
-  std::vector<linked_ptr<serial::ConnectionInfo> > infos;
+  std::vector<serial::ConnectionInfo> infos;
   const base::hash_set<int>* connection_ids =
       manager_->GetResourceIds(extension_->id());
   if (connection_ids) {
     for (base::hash_set<int>::const_iterator it = connection_ids->begin();
          it != connection_ids->end();
          ++it) {
       int connection_id = *it;
       SerialConnection* connection = GetSerialConnection(connection_id);
       if (connection) {
-        linked_ptr<serial::ConnectionInfo> info(new serial::ConnectionInfo());
-        info->connection_id = connection_id;
-        connection->GetInfo(info.get());
-        infos.push_back(info);
+        serial::ConnectionInfo info;
+        info.connection_id = connection_id;
+        connection->GetInfo(&info);
+        infos.push_back(std::move(info));
       }
     }
   }
   results_ = serial::GetConnections::Results::Create(infos);
 }
 
 SerialGetControlSignalsFunction::SerialGetControlSignalsFunction() {
 }
 
 SerialGetControlSignalsFunction::~SerialGetControlSignalsFunction() {
@@ skipping 93 matching lines @@
   results_ = serial::ClearBreak::Results::Create(success);
 }
 
 }  // namespace api
 
 }  // namespace extensions
 
 namespace mojo {
 
 // static
-linked_ptr<extensions::api::serial::DeviceInfo> TypeConverter<
-    linked_ptr<extensions::api::serial::DeviceInfo>,
+extensions::api::serial::DeviceInfo TypeConverter<
+    extensions::api::serial::DeviceInfo,
     device::serial::DeviceInfoPtr>::Convert(const device::serial::DeviceInfoPtr&
                                                 device) {
-  linked_ptr<extensions::api::serial::DeviceInfo> info(
-      new extensions::api::serial::DeviceInfo);
-  info->path = device->path;
+  extensions::api::serial::DeviceInfo info;
+  info.path = device->path;
   if (device->has_vendor_id)
-    info->vendor_id.reset(new int(static_cast<int>(device->vendor_id)));
+    info.vendor_id.reset(new int(static_cast<int>(device->vendor_id)));
   if (device->has_product_id)
-    info->product_id.reset(new int(static_cast<int>(device->product_id)));
+    info.product_id.reset(new int(static_cast<int>(device->product_id)));
   if (device->display_name)
-    info->display_name.reset(new std::string(device->display_name));
+    info.display_name.reset(new std::string(device->display_name));
   return info;
 }
 
 }  // namespace mojo