Remove FundamentalValue

extensions/browser/api/socket/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/socket/socket_api.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 105 matching lines @@
 
 void SocketAsyncApiFunction::OpenFirewallHole(const std::string& address,
                                               int socket_id,
                                               Socket* socket) {
 #if defined(OS_CHROMEOS)
   if (!net::IsLocalhost(address)) {
     net::IPEndPoint local_address;
     if (!socket->GetLocalAddress(&local_address)) {
       NOTREACHED() << "Cannot get address of recently bound socket.";
       error_ = kFirewallFailure;
-      SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+      SetResult(base::MakeUnique<base::Value>(-1));
       AsyncWorkCompleted();
       return;
     }
 
     AppFirewallHole::PortType type = socket->GetSocketType() == Socket::TYPE_TCP
                                          ? AppFirewallHole::PortType::TCP
                                          : AppFirewallHole::PortType::UDP;
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
@@ skipping 21 matching lines @@
       base::Bind(&SocketAsyncApiFunction::OnFirewallHoleOpened, this, socket_id,
                  base::Passed(&hole)));
 }
 
 void SocketAsyncApiFunction::OnFirewallHoleOpened(
     int socket_id,
     std::unique_ptr<AppFirewallHole, BrowserThread::DeleteOnUIThread> hole) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!hole) {
     error_ = kFirewallFailure;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   Socket* socket = GetSocket(socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   socket->set_firewall_hole(std::move(hole));
   AsyncWorkCompleted();
 }
 
 #endif  // OS_CHROMEOS
 
@@ skipping 97 matching lines @@
     return false;
   }
   port_ = static_cast<uint16_t>(port);
   return true;
 }
 
 void SocketConnectFunction::AsyncWorkStart() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   socket->set_hostname(hostname_);
 
   SocketPermissionRequest::OperationType operation_type;
   switch (socket->GetSocketType()) {
     case Socket::TYPE_TCP:
       operation_type = SocketPermissionRequest::TCP_CONNECT;
       break;
     case Socket::TYPE_UDP:
       operation_type = SocketPermissionRequest::UDP_SEND_TO;
       break;
     default:
       NOTREACHED() << "Unknown socket type.";
       operation_type = SocketPermissionRequest::NONE;
       break;
   }
 
   SocketPermission::CheckParam param(operation_type, hostname_, port_);
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   StartDnsLookup(net::HostPortPair(hostname_, port_));
 }
 
 void SocketConnectFunction::AfterDnsLookup(int lookup_result) {
   if (lookup_result == net::OK) {
     StartConnect();
   } else {
-    SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
+    SetResult(base::MakeUnique<base::Value>(lookup_result));
     AsyncWorkCompleted();
   }
 }
 
 void SocketConnectFunction::StartConnect() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   socket->Connect(addresses_,
                   base::Bind(&SocketConnectFunction::OnConnect, this));
 }
 
 void SocketConnectFunction::OnConnect(int result) {
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
   AsyncWorkCompleted();
 }
 
 bool SocketDisconnectFunction::Prepare() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &socket_id_));
   return true;
 }
 
 void SocketDisconnectFunction::Work() {
   Socket* socket = GetSocket(socket_id_);
@@ skipping 14 matching lines @@
     return false;
   }
   port_ = static_cast<uint16_t>(port);
   return true;
 }
 
 void SocketBindFunction::AsyncWorkStart() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   if (socket->GetSocketType() == Socket::TYPE_TCP) {
     error_ = kTCPSocketBindError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   CHECK(socket->GetSocketType() == Socket::TYPE_UDP);
   SocketPermission::CheckParam param(SocketPermissionRequest::UDP_BIND,
                                      address_, port_);
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   int result = socket->Bind(address_, port_);
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
   if (result != net::OK) {
     AsyncWorkCompleted();
     return;
   }
 
   OpenFirewallHole(address_, socket_id_, socket);
 }
 
 SocketListenFunction::SocketListenFunction() {}
 
 SocketListenFunction::~SocketListenFunction() {}
 
 bool SocketListenFunction::Prepare() {
   params_ = api::socket::Listen::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketListenFunction::AsyncWorkStart() {
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   SocketPermission::CheckParam param(SocketPermissionRequest::TCP_LISTEN,
                                      params_->address, params_->port);
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   int result =
       socket->Listen(params_->address, params_->port,
                      params_->backlog.get() ? *params_->backlog : 5, &error_);
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
   if (result != net::OK) {
     AsyncWorkCompleted();
     return;
   }
 
   OpenFirewallHole(params_->address, params_->socket_id, socket);
 }
 
 SocketAcceptFunction::SocketAcceptFunction() {}
 
@@ skipping 170 matching lines @@
 
   io_buffer_size_ = data->GetSize();
   io_buffer_ = new net::WrappedIOBuffer(data->GetBuffer());
   return true;
 }
 
 void SocketSendToFunction::AsyncWorkStart() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   if (socket->GetSocketType() == Socket::TYPE_UDP) {
     SocketPermission::CheckParam param(
         SocketPermissionRequest::UDP_SEND_TO, hostname_, port_);
     if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
             APIPermission::kSocket, &param)) {
       error_ = kPermissionError;
-      SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+      SetResult(base::MakeUnique<base::Value>(-1));
       AsyncWorkCompleted();
       return;
     }
   }
 
   StartDnsLookup(net::HostPortPair(hostname_, port_));
 }
 
 void SocketSendToFunction::AfterDnsLookup(int lookup_result) {
   if (lookup_result == net::OK) {
     StartSendTo();
   } else {
-    SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
+    SetResult(base::MakeUnique<base::Value>(lookup_result));
     AsyncWorkCompleted();
   }
 }
 
 void SocketSendToFunction::StartSendTo() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+    SetResult(base::MakeUnique<base::Value>(-1));
     AsyncWorkCompleted();
     return;
   }
 
   socket->SendTo(io_buffer_, io_buffer_size_, addresses_.front(),
                  base::Bind(&SocketSendToFunction::OnCompleted, this));
 }
 
 void SocketSendToFunction::OnCompleted(int bytes_written) {
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
@@ skipping 17 matching lines @@
   bool result = false;
   Socket* socket = GetSocket(params_->socket_id);
   if (socket) {
     int delay = 0;
     if (params_->delay.get())
       delay = *params_->delay;
     result = socket->SetKeepAlive(params_->enable, delay);
   } else {
     error_ = kSocketNotFoundError;
   }
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketSetNoDelayFunction::SocketSetNoDelayFunction() {}
 
 SocketSetNoDelayFunction::~SocketSetNoDelayFunction() {}
 
 bool SocketSetNoDelayFunction::Prepare() {
   params_ = api::socket::SetNoDelay::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketSetNoDelayFunction::Work() {
   bool result = false;
   Socket* socket = GetSocket(params_->socket_id);
   if (socket)
     result = socket->SetNoDelay(params_->no_delay);
   else
     error_ = kSocketNotFoundError;
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketGetInfoFunction::SocketGetInfoFunction() {}
 
 SocketGetInfoFunction::~SocketGetInfoFunction() {}
 
 bool SocketGetInfoFunction::Prepare() {
   params_ = api::socket::GetInfo::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
@@ skipping 93 matching lines @@
   params_ = api::socket::JoinGroup::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketJoinGroupFunction::Work() {
   int result = -1;
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP,
       kWildcardAddress,
       kWildcardPort);
 
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   result = static_cast<UDPSocket*>(socket)->JoinGroup(params_->address);
   if (result != 0) {
     error_ = net::ErrorToString(result);
   }
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketLeaveGroupFunction::SocketLeaveGroupFunction() {}
 
 SocketLeaveGroupFunction::~SocketLeaveGroupFunction() {}
 
 bool SocketLeaveGroupFunction::Prepare() {
   params_ = api::socket::LeaveGroup::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketLeaveGroupFunction::Work() {
   int result = -1;
   Socket* socket = GetSocket(params_->socket_id);
 
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP,
       kWildcardAddress,
       kWildcardPort);
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   result = static_cast<UDPSocket*>(socket)->LeaveGroup(params_->address);
   if (result != 0)
     error_ = net::ErrorToString(result);
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketSetMulticastTimeToLiveFunction::SocketSetMulticastTimeToLiveFunction() {}
 
 SocketSetMulticastTimeToLiveFunction::~SocketSetMulticastTimeToLiveFunction() {}
 
 bool SocketSetMulticastTimeToLiveFunction::Prepare() {
   params_ = api::socket::SetMulticastTimeToLive::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 void SocketSetMulticastTimeToLiveFunction::Work() {
   int result = -1;
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   result =
       static_cast<UDPSocket*>(socket)->SetMulticastTimeToLive(params_->ttl);
   if (result != 0)
     error_ = net::ErrorToString(result);
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketSetMulticastLoopbackModeFunction::
     SocketSetMulticastLoopbackModeFunction() {}
 
 SocketSetMulticastLoopbackModeFunction::
     ~SocketSetMulticastLoopbackModeFunction() {}
 
 bool SocketSetMulticastLoopbackModeFunction::Prepare() {
   params_ = api::socket::SetMulticastLoopbackMode::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketSetMulticastLoopbackModeFunction::Work() {
   int result = -1;
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   result = static_cast<UDPSocket*>(socket)
                ->SetMulticastLoopbackMode(params_->enabled);
   if (result != 0)
     error_ = net::ErrorToString(result);
-  SetResult(base::MakeUnique<base::FundamentalValue>(result));
+  SetResult(base::MakeUnique<base::Value>(result));
 }
 
 SocketGetJoinedGroupsFunction::SocketGetJoinedGroupsFunction() {}
 
 SocketGetJoinedGroupsFunction::~SocketGetJoinedGroupsFunction() {}
 
 bool SocketGetJoinedGroupsFunction::Prepare() {
   params_ = api::socket::GetJoinedGroups::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketGetJoinedGroupsFunction::Work() {
   int result = -1;
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
     error_ = kSocketNotFoundError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP,
       kWildcardAddress,
       kWildcardPort);
   if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
           APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
-    SetResult(base::MakeUnique<base::FundamentalValue>(result));
+    SetResult(base::MakeUnique<base::Value>(result));
     return;
   }
 
   std::unique_ptr<base::ListValue> values(new base::ListValue());
   values->AppendStrings((std::vector<std::string>&)static_cast<UDPSocket*>(
                             socket)->GetJoinedGroups());
   SetResult(std::move(values));
 }
 
 SocketSecureFunction::SocketSecureFunction() {
@@ skipping 11 matching lines @@
   return true;
 }
 
 // Override the regular implementation, which would call AsyncWorkCompleted
 // immediately after Work().
 void SocketSecureFunction::AsyncWorkStart() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   Socket* socket = GetSocket(params_->socket_id);
   if (!socket) {
-    SetResult(
-        base::MakeUnique<base::FundamentalValue>(net::ERR_INVALID_ARGUMENT));
+    SetResult(base::MakeUnique<base::Value>(net::ERR_INVALID_ARGUMENT));
     error_ = kSocketNotFoundError;
     AsyncWorkCompleted();
     return;
   }
 
   // Make sure that the socket is a TCP client socket.
   if (socket->GetSocketType() != Socket::TYPE_TCP ||
       static_cast<TCPSocket*>(socket)->ClientStream() == NULL) {
-    SetResult(
-        base::MakeUnique<base::FundamentalValue>(net::ERR_INVALID_ARGUMENT));
+    SetResult(base::MakeUnique<base::Value>(net::ERR_INVALID_ARGUMENT));
     error_ = kSecureSocketTypeError;
     AsyncWorkCompleted();
     return;
   }
 
   if (!socket->IsConnected()) {
-    SetResult(
-        base::MakeUnique<base::FundamentalValue>(net::ERR_INVALID_ARGUMENT));
+    SetResult(base::MakeUnique<base::Value>(net::ERR_INVALID_ARGUMENT));
     error_ = kSocketNotConnectedError;
     AsyncWorkCompleted();
     return;
   }
 
   net::URLRequestContext* url_request_context =
       url_request_getter_->GetURLRequestContext();
 
   TLSSocket::UpgradeSocketToTLS(
       socket, url_request_context->ssl_config_service(),
@@ skipping 15 matching lines @@
   } else {
     RemoveSocket(params_->socket_id);
     error_ = net::ErrorToString(result);
   }
 
   results_ = api::socket::Secure::Results::Create(result);
   AsyncWorkCompleted();
 }
 
 }  // namespace extensions