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

extensions/browser/api/bluetooth_socket/bluetooth_socket_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/bluetooth_socket/bluetooth_socket_api.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "content/public/browser/browser_context.h"
@@ skipping 18 matching lines @@
 namespace api {
 
 namespace {
 
 const char kDeviceNotFoundError[] = "Device not found";
 const char kInvalidPsmError[] = "Invalid PSM";
 const char kInvalidUuidError[] = "Invalid UUID";
 const char kPermissionDeniedError[] = "Permission denied";
 const char kSocketNotFoundError[] = "Socket not found";
 
-linked_ptr<SocketInfo> CreateSocketInfo(int socket_id,
-                                        BluetoothApiSocket* socket) {
+SocketInfo CreateSocketInfo(int socket_id, BluetoothApiSocket* socket) {
   DCHECK_CURRENTLY_ON(BluetoothApiSocket::kThreadId);
-  linked_ptr<SocketInfo> socket_info(new SocketInfo());
+  SocketInfo socket_info;
   // This represents what we know about the socket, and does not call through
   // to the system.
-  socket_info->socket_id = socket_id;
+  socket_info.socket_id = socket_id;
   if (socket->name()) {
-    socket_info->name.reset(new std::string(*socket->name()));
+    socket_info.name.reset(new std::string(*socket->name()));
   }
-  socket_info->persistent = socket->persistent();
+  socket_info.persistent = socket->persistent();
   if (socket->buffer_size() > 0) {
-    socket_info->buffer_size.reset(new int(socket->buffer_size()));
+    socket_info.buffer_size.reset(new int(socket->buffer_size()));
   }
-  socket_info->paused = socket->paused();
-  socket_info->connected = socket->IsConnected();
+  socket_info.paused = socket->paused();
+  socket_info.connected = socket->IsConnected();
 
   if (socket->IsConnected())
-    socket_info->address.reset(new std::string(socket->device_address()));
-  socket_info->uuid.reset(new std::string(socket->uuid().canonical_value()));
+    socket_info.address.reset(new std::string(socket->device_address()));
+  socket_info.uuid.reset(new std::string(socket->uuid().canonical_value()));
 
   return socket_info;
 }
 
 void SetSocketProperties(BluetoothApiSocket* socket,
                          SocketProperties* properties) {
   if (properties->name.get()) {
     socket->set_name(*properties->name.get());
   }
   if (properties->persistent.get()) {
@@ skipping 569 matching lines @@
   return true;
 }
 
 void BluetoothSocketGetInfoFunction::Work() {
   BluetoothApiSocket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
     return;
   }
 
-  linked_ptr<bluetooth_socket::SocketInfo> socket_info =
-      CreateSocketInfo(params_->socket_id, socket);
-  results_ = bluetooth_socket::GetInfo::Results::Create(*socket_info);
+  results_ = bluetooth_socket::GetInfo::Results::Create(
+      CreateSocketInfo(params_->socket_id, socket));
 }
 
 BluetoothSocketGetSocketsFunction::BluetoothSocketGetSocketsFunction() {}
 
 BluetoothSocketGetSocketsFunction::~BluetoothSocketGetSocketsFunction() {}
 
 bool BluetoothSocketGetSocketsFunction::Prepare() { return true; }
 
 void BluetoothSocketGetSocketsFunction::Work() {
-  std::vector<linked_ptr<bluetooth_socket::SocketInfo> > socket_infos;
+  std::vector<bluetooth_socket::SocketInfo> socket_infos;
   base::hash_set<int>* resource_ids = GetSocketIds();
-  if (resource_ids != NULL) {
-    for (base::hash_set<int>::iterator it = resource_ids->begin();
-         it != resource_ids->end();
-         ++it) {
-      int socket_id = *it;
+  if (resource_ids) {
+    for (int socket_id : *resource_ids) {
       BluetoothApiSocket* socket = GetSocket(socket_id);
       if (socket) {
         socket_infos.push_back(CreateSocketInfo(socket_id, socket));
       }
     }
   }
   results_ = bluetooth_socket::GetSockets::Results::Create(socket_infos);
 }
 
 }  // namespace api
 }  // namespace extensions