summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/client_socket_pool_base_unittest.cc2
-rw-r--r--net/socket/client_socket_pool_manager_impl.cc6
-rw-r--r--net/socket/nss_ssl_util.cc4
-rw-r--r--net/socket/socket_net_log_params.cc28
-rw-r--r--net/socket/socks_client_socket_pool.cc6
-rw-r--r--net/socket/ssl_client_socket_pool.cc6
-rw-r--r--net/socket/ssl_error_params.cc8
-rw-r--r--net/socket/transport_client_socket_pool.cc2
8 files changed, 31 insertions, 31 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 7188290..8021f32 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -563,7 +563,7 @@ class TestClientSocketPool : public ClientSocketPool {
base_.RemoveLayeredPool(pool);
}
- virtual DictionaryValue* GetInfoAsValue(
+ virtual base::DictionaryValue* GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const OVERRIDE {
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index e8fabaa..b557874 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -19,7 +19,7 @@ namespace {
// Appends information about all |socket_pools| to the end of |list|.
template <class MapType>
-void AddSocketPoolsToList(ListValue* list,
+void AddSocketPoolsToList(base::ListValue* list,
const MapType& socket_pools,
const std::string& type,
bool include_nested_pools) {
@@ -341,8 +341,8 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
return ret.first->second;
}
-Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
- ListValue* list = new ListValue();
+base::Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
+ base::ListValue* list = new base::ListValue();
list->Append(transport_socket_pool_->GetInfoAsValue("transport_socket_pool",
"transport_socket_pool",
false));
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc
index 004f0ed..e6307af 100644
--- a/net/socket/nss_ssl_util.cc
+++ b/net/socket/nss_ssl_util.cc
@@ -226,12 +226,12 @@ int MapNSSError(PRErrorCode err) {
// Returns parameters to attach to the NetLog when we receive an error in
// response to a call to an NSS function. Used instead of
// NetLogSSLErrorCallback with events of type TYPE_SSL_NSS_ERROR.
-Value* NetLogSSLFailedNSSFunctionCallback(
+base::Value* NetLogSSLFailedNSSFunctionCallback(
const char* function,
const char* param,
int ssl_lib_error,
NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("function", function);
if (param[0] != '\0')
dict->SetString("param", param);
diff --git a/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc
index c075ec5..bcc12c8 100644
--- a/net/socket/socket_net_log_params.cc
+++ b/net/socket/socket_net_log_params.cc
@@ -14,33 +14,33 @@ namespace net {
namespace {
-Value* NetLogSocketErrorCallback(int net_error,
- int os_error,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSocketErrorCallback(int net_error,
+ int os_error,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("net_error", net_error);
dict->SetInteger("os_error", os_error);
return dict;
}
-Value* NetLogHostPortPairCallback(const HostPortPair* host_and_port,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogHostPortPairCallback(const HostPortPair* host_and_port,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("host_and_port", host_and_port->ToString());
return dict;
}
-Value* NetLogIPEndPointCallback(const IPEndPoint* address,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogIPEndPointCallback(const IPEndPoint* address,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("address", address->ToString());
return dict;
}
-Value* NetLogSourceAddressCallback(const struct sockaddr* net_address,
- socklen_t address_len,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSourceAddressCallback(const struct sockaddr* net_address,
+ socklen_t address_len,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("source_address",
NetAddressToStringWithPort(net_address, address_len));
return dict;
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index 5e34cd0..ad541ce 100644
--- a/net/socket/socks_client_socket_pool.cc
+++ b/net/socket/socks_client_socket_pool.cc
@@ -276,13 +276,13 @@ void SOCKSClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
base_.RemoveLayeredPool(layered_pool);
}
-DictionaryValue* SOCKSClientSocketPool::GetInfoAsValue(
+base::DictionaryValue* SOCKSClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const {
- DictionaryValue* dict = base_.GetInfoAsValue(name, type);
+ base::DictionaryValue* dict = base_.GetInfoAsValue(name, type);
if (include_nested_pools) {
- ListValue* list = new ListValue();
+ base::ListValue* list = new base::ListValue();
list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool",
"transport_socket_pool",
false));
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index e9b9ec5..b212b01 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -583,13 +583,13 @@ void SSLClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
base_.RemoveLayeredPool(layered_pool);
}
-DictionaryValue* SSLClientSocketPool::GetInfoAsValue(
+base::DictionaryValue* SSLClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const {
- DictionaryValue* dict = base_.GetInfoAsValue(name, type);
+ base::DictionaryValue* dict = base_.GetInfoAsValue(name, type);
if (include_nested_pools) {
- ListValue* list = new ListValue();
+ base::ListValue* list = new base::ListValue();
if (transport_pool_) {
list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool",
"transport_socket_pool",
diff --git a/net/socket/ssl_error_params.cc b/net/socket/ssl_error_params.cc
index 8fc381f..37561f0 100644
--- a/net/socket/ssl_error_params.cc
+++ b/net/socket/ssl_error_params.cc
@@ -11,10 +11,10 @@ namespace net {
namespace {
-Value* NetLogSSLErrorCallback(int net_error,
- int ssl_lib_error,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSSLErrorCallback(int net_error,
+ int ssl_lib_error,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("net_error", net_error);
if (ssl_lib_error)
dict->SetInteger("ssl_lib_error", ssl_lib_error);
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index b3ef53b..2989252 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -458,7 +458,7 @@ void TransportClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
base_.RemoveLayeredPool(layered_pool);
}
-DictionaryValue* TransportClientSocketPool::GetInfoAsValue(
+base::DictionaryValue* TransportClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const {
generated by cgit v1.1 at 2025-05-07 16:14:44 +0000