Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/browser/api/socket/socket_api.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/api/networking_private/networking_private_chromeos.cc ('k') | extensions/browser/api/sockets_tcp/sockets_tcp_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/socket/socket_api.cc
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index cbc801987adf91e7f66b5b2f646caea9db4864b5..f8cf52ba96eb1c1de3f0294cf095c9c7fbbebe83 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -123,7 +123,7 @@ void SocketAsyncApiFunction::OpenFirewallHole(const std::string& 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;
}
@@ -165,7 +165,7 @@ void SocketAsyncApiFunction::OnFirewallHoleOpened(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!hole) {
error_ = kFirewallFailure;
- SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+ SetResult(base::MakeUnique<base::Value>(-1));
AsyncWorkCompleted();
return;
}
@@ -173,7 +173,7 @@ void SocketAsyncApiFunction::OnFirewallHoleOpened(
Socket* socket = GetSocket(socket_id);
if (!socket) {
error_ = kSocketNotFoundError;
- SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+ SetResult(base::MakeUnique<base::Value>(-1));
AsyncWorkCompleted();
return;
}
@@ -291,7 +291,7 @@ 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;
}
@@ -316,7 +316,7 @@ void SocketConnectFunction::AsyncWorkStart() {
if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
APIPermission::kSocket, &param)) {
error_ = kPermissionError;
- SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+ SetResult(base::MakeUnique<base::Value>(-1));
AsyncWorkCompleted();
return;
}
@@ -328,7 +328,7 @@ 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();
}
}
@@ -337,7 +337,7 @@ 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;
}
@@ -347,7 +347,7 @@ void SocketConnectFunction::StartConnect() {
}
void SocketConnectFunction::OnConnect(int result) {
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
AsyncWorkCompleted();
}
@@ -382,14 +382,14 @@ 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;
}
@@ -400,13 +400,13 @@ void SocketBindFunction::AsyncWorkStart() {
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;
@@ -429,7 +429,7 @@ 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;
}
@@ -439,7 +439,7 @@ void SocketListenFunction::AsyncWorkStart() {
if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
APIPermission::kSocket, &param)) {
error_ = kPermissionError;
- SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+ SetResult(base::MakeUnique<base::Value>(-1));
AsyncWorkCompleted();
return;
}
@@ -447,7 +447,7 @@ void SocketListenFunction::AsyncWorkStart() {
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;
@@ -638,7 +638,7 @@ 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;
}
@@ -649,7 +649,7 @@ void SocketSendToFunction::AsyncWorkStart() {
if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
APIPermission::kSocket, &param)) {
error_ = kPermissionError;
- SetResult(base::MakeUnique<base::FundamentalValue>(-1));
+ SetResult(base::MakeUnique<base::Value>(-1));
AsyncWorkCompleted();
return;
}
@@ -662,7 +662,7 @@ 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();
}
}
@@ -671,7 +671,7 @@ 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;
}
@@ -709,7 +709,7 @@ void SocketSetKeepAliveFunction::Work() {
} else {
error_ = kSocketNotFoundError;
}
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
}
SocketSetNoDelayFunction::SocketSetNoDelayFunction() {}
@@ -729,7 +729,7 @@ void SocketSetNoDelayFunction::Work() {
result = socket->SetNoDelay(params_->no_delay);
else
error_ = kSocketNotFoundError;
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
}
SocketGetInfoFunction::SocketGetInfoFunction() {}
@@ -843,13 +843,13 @@ void SocketJoinGroupFunction::Work() {
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;
}
@@ -861,7 +861,7 @@ void SocketJoinGroupFunction::Work() {
if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
APIPermission::kSocket, &param)) {
error_ = kPermissionError;
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
return;
}
@@ -869,7 +869,7 @@ void SocketJoinGroupFunction::Work() {
if (result != 0) {
error_ = net::ErrorToString(result);
}
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
}
SocketLeaveGroupFunction::SocketLeaveGroupFunction() {}
@@ -888,13 +888,13 @@ void SocketLeaveGroupFunction::Work() {
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;
}
@@ -905,14 +905,14 @@ void SocketLeaveGroupFunction::Work() {
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() {}
@@ -929,13 +929,13 @@ void SocketSetMulticastTimeToLiveFunction::Work() {
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;
}
@@ -943,7 +943,7 @@ void SocketSetMulticastTimeToLiveFunction::Work() {
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::
@@ -963,13 +963,13 @@ void SocketSetMulticastLoopbackModeFunction::Work() {
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;
}
@@ -977,7 +977,7 @@ void SocketSetMulticastLoopbackModeFunction::Work() {
->SetMulticastLoopbackMode(params_->enabled);
if (result != 0)
error_ = net::ErrorToString(result);
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
}
SocketGetJoinedGroupsFunction::SocketGetJoinedGroupsFunction() {}
@@ -995,13 +995,13 @@ void SocketGetJoinedGroupsFunction::Work() {
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;
}
@@ -1012,7 +1012,7 @@ void SocketGetJoinedGroupsFunction::Work() {
if (!extension()->permissions_data()->CheckAPIPermissionWithParam(
APIPermission::kSocket, &param)) {
error_ = kPermissionError;
- SetResult(base::MakeUnique<base::FundamentalValue>(result));
+ SetResult(base::MakeUnique<base::Value>(result));
return;
}
@@ -1044,8 +1044,7 @@ void SocketSecureFunction::AsyncWorkStart() {
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;
@@ -1054,16 +1053,14 @@ void SocketSecureFunction::AsyncWorkStart() {
// 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;
« no previous file with comments | « extensions/browser/api/networking_private/networking_private_chromeos.cc ('k') | extensions/browser/api/sockets_tcp/sockets_tcp_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698