summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/address_list_net_log_param.h2
-rw-r--r--net/base/crl_filter.h2
-rw-r--r--net/base/net_log.h24
-rw-r--r--net/disk_cache/net_log_parameters.h12
-rw-r--r--net/http/http_net_log_params.h7
-rw-r--r--net/http/http_network_session.h6
-rw-r--r--net/http/http_proxy_client_socket_pool.h7
-rw-r--r--net/proxy/proxy_config.h4
-rw-r--r--net/socket/client_socket_pool.h9
-rw-r--r--net/socket/client_socket_pool_base.h8
-rw-r--r--net/socket/client_socket_pool_base_unittest.cc1
-rw-r--r--net/socket/client_socket_pool_manager.h5
-rw-r--r--net/socket/socks_client_socket_pool.h7
-rw-r--r--net/socket/ssl_client_socket_pool.h7
-rw-r--r--net/socket/ssl_error_params.h2
-rw-r--r--net/socket/transport_client_socket_pool.cc1
-rw-r--r--net/socket/transport_client_socket_pool.h7
-rw-r--r--net/spdy/spdy_session.h4
-rw-r--r--net/spdy/spdy_session_pool.h2
-rw-r--r--net/test/test_server.h9
-rw-r--r--net/url_request/url_request_netlog_params.h2
21 files changed, 74 insertions, 54 deletions
diff --git a/net/base/address_list_net_log_param.h b/net/base/address_list_net_log_param.h
index 141c2d0..4c621b3 100644
--- a/net/base/address_list_net_log_param.h
+++ b/net/base/address_list_net_log_param.h
@@ -18,7 +18,7 @@ class AddressListNetLogParam : public NetLog::EventParameters {
public:
explicit AddressListNetLogParam(const AddressList& address_list);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
AddressList address_list_;
diff --git a/net/base/crl_filter.h b/net/base/crl_filter.h
index 5368a12..787d82a 100644
--- a/net/base/crl_filter.h
+++ b/net/base/crl_filter.h
@@ -17,8 +17,6 @@
#include "base/synchronization/lock.h"
#include "net/base/net_api.h"
-class DictionaryValue;
-
namespace net {
class GolombCompressedSet;
diff --git a/net/base/net_log.h b/net/base/net_log.h
index 9f7af36..39fa915 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -13,7 +13,9 @@
#include "base/memory/ref_counted.h"
#include "net/base/net_api.h"
+namespace base {
class Value;
+}
namespace base {
class TimeTicks;
@@ -64,7 +66,7 @@ class NET_API NetLog {
bool is_valid() const { return id != kInvalidId; }
// The caller takes ownership of the returned Value*.
- Value* ToValue() const;
+ base::Value* ToValue() const;
SourceType type;
uint32 id;
@@ -82,7 +84,7 @@ class NET_API NetLog {
// Serializes the parameters to a Value tree. This is intended to be a
// lossless conversion, which is used to serialize the parameters to JSON.
// The caller takes ownership of the returned Value*.
- virtual Value* ToValue() const = 0;
+ virtual base::Value* ToValue() const = 0;
private:
DISALLOW_COPY_AND_ASSIGN(EventParameters);
@@ -146,12 +148,12 @@ class NET_API NetLog {
// Serializes the specified event to a DictionaryValue.
// If |use_strings| is true, uses strings rather than numeric ids.
- static Value* EntryToDictionaryValue(NetLog::EventType type,
- const base::TimeTicks& time,
- const NetLog::Source& source,
- NetLog::EventPhase phase,
- NetLog::EventParameters* params,
- bool use_strings);
+ static base::Value* EntryToDictionaryValue(NetLog::EventType type,
+ const base::TimeTicks& time,
+ const NetLog::Source& source,
+ NetLog::EventPhase phase,
+ NetLog::EventParameters* params,
+ bool use_strings);
private:
DISALLOW_COPY_AND_ASSIGN(NetLog);
@@ -233,7 +235,7 @@ class NetLogStringParameter : public NetLog::EventParameters {
return value_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const char* const name_;
@@ -252,7 +254,7 @@ class NetLogIntegerParameter : public NetLog::EventParameters {
return value_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const char* name_;
@@ -271,7 +273,7 @@ class NET_API NetLogSourceParameter : public NetLog::EventParameters {
return value_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const char* name_;
diff --git a/net/disk_cache/net_log_parameters.h b/net/disk_cache/net_log_parameters.h
index f708c79..f248f0f 100644
--- a/net/disk_cache/net_log_parameters.h
+++ b/net/disk_cache/net_log_parameters.h
@@ -19,7 +19,7 @@ namespace disk_cache {
class EntryCreationParameters : public net::NetLog::EventParameters {
public:
EntryCreationParameters(const std::string& key, bool created);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const std::string key_;
@@ -33,7 +33,7 @@ class ReadWriteDataParameters : public net::NetLog::EventParameters {
public:
// For reads, |truncate| must be false.
ReadWriteDataParameters(int index, int offset, int buf_len, bool truncate);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const int index_;
@@ -51,7 +51,7 @@ class ReadWriteCompleteParameters : public net::NetLog::EventParameters {
// code. |bytes_copied| must not be ERR_IO_PENDING, as it's not a valid
// result for an operation.
explicit ReadWriteCompleteParameters(int bytes_copied);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const int bytes_copied_;
@@ -63,7 +63,7 @@ class ReadWriteCompleteParameters : public net::NetLog::EventParameters {
class SparseOperationParameters : public net::NetLog::EventParameters {
public:
SparseOperationParameters(int64 offset, int buff_len);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const int64 offset_;
@@ -75,7 +75,7 @@ class SparseOperationParameters : public net::NetLog::EventParameters {
class SparseReadWriteParameters : public net::NetLog::EventParameters {
public:
SparseReadWriteParameters(const net::NetLog::Source& source, int child_len);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const net::NetLog::Source source_;
@@ -87,7 +87,7 @@ class GetAvailableRangeResultParameters : public net::NetLog::EventParameters {
public:
// |start| is ignored when |result| < 0.
GetAvailableRangeResultParameters(int64 start, int result);
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const int64 start_;
diff --git a/net/http/http_net_log_params.h b/net/http/http_net_log_params.h
index 92039ca..1ba94de 100644
--- a/net/http/http_net_log_params.h
+++ b/net/http/http_net_log_params.h
@@ -13,7 +13,9 @@
#include "net/base/net_log.h"
#include "net/http/http_request_headers.h"
+namespace base {
class Value;
+}
namespace net {
@@ -33,7 +35,7 @@ class NetLogHttpRequestParameter : public NetLog::EventParameters {
}
// NetLog::EventParameters
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
virtual ~NetLogHttpRequestParameter();
@@ -54,7 +56,7 @@ class NetLogHttpResponseParameter : public NetLog::EventParameters {
}
// NetLog::EventParameters
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
virtual ~NetLogHttpResponseParameter();
@@ -67,4 +69,3 @@ class NetLogHttpResponseParameter : public NetLog::EventParameters {
} // namespace net
#endif // NET_HTTP_HTTP_NET_LOG_PARAMS_H_
-
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 7d5b67f..f7da921 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -20,7 +20,9 @@
#include "net/spdy/spdy_session_pool.h"
#include "net/spdy/spdy_settings_storage.h"
+namespace base {
class Value;
+}
namespace net {
@@ -127,11 +129,11 @@ class NET_API HttpNetworkSession
// Creates a Value summary of the state of the socket pools. The caller is
// responsible for deleting the returned value.
- Value* SocketPoolInfoToValue() const;
+ base::Value* SocketPoolInfoToValue() const;
// Creates a Value summary of the state of the SPDY sessions. The caller is
// responsible for deleting the returned value.
- Value* SpdySessionPoolInfoToValue() const;
+ base::Value* SpdySessionPoolInfoToValue() const;
void CloseAllConnections();
void CloseIdleConnections();
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index ac254ff..c3dc24b 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -211,9 +211,10 @@ class NET_TEST HttpProxyClientSocketPool : public ClientSocketPool {
virtual LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const;
- virtual DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type,
- bool include_nested_pools) const;
+ virtual base::DictionaryValue* GetInfoAsValue(
+ const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const;
virtual base::TimeDelta ConnectionTimeout() const;
diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h
index be5e2fb..fe3a1d17 100644
--- a/net/proxy/proxy_config.h
+++ b/net/proxy/proxy_config.h
@@ -13,7 +13,9 @@
#include "net/proxy/proxy_bypass_rules.h"
#include "net/proxy/proxy_server.h"
+namespace base {
class Value;
+}
namespace net {
@@ -131,7 +133,7 @@ class NET_API ProxyConfig {
// Creates a Value dump of this configuration. The caller is responsible for
// deleting the returned value.
- Value* ToValue() const;
+ base::Value* ToValue() const;
ProxyRules& proxy_rules() {
return proxy_rules_;
diff --git a/net/socket/client_socket_pool.h b/net/socket/client_socket_pool.h
index 77d58fa..c50af84 100644
--- a/net/socket/client_socket_pool.h
+++ b/net/socket/client_socket_pool.h
@@ -19,7 +19,9 @@
#include "net/base/net_api.h"
#include "net/base/request_priority.h"
+namespace base {
class DictionaryValue;
+}
namespace net {
@@ -125,9 +127,10 @@ class NET_API ClientSocketPool {
// DictionaryValue. Caller takes possession of the returned value.
// If |include_nested_pools| is true, the states of any nested
// ClientSocketPools will be included.
- virtual DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type,
- bool include_nested_pools) const = 0;
+ virtual base::DictionaryValue* GetInfoAsValue(
+ const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const = 0;
// Returns the maximum amount of time to wait before retrying a connect.
static const int kMaxConnectRetryIntervalMs = 250;
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index d4b1dbc..dd73f8b 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -298,8 +298,8 @@ class NET_TEST ClientSocketPoolBaseHelper
void CleanupIdleSockets(bool force);
// See ClientSocketPool::GetInfoAsValue for documentation on this function.
- DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type) const;
+ base::DictionaryValue* GetInfoAsValue(const std::string& name,
+ const std::string& type) const;
base::TimeDelta ConnectionTimeout() const {
return connect_job_factory_->ConnectionTimeout();
@@ -712,8 +712,8 @@ class ClientSocketPoolBase {
return helper_.CleanupIdleSockets(force);
}
- DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type) const {
+ base::DictionaryValue* GetInfoAsValue(const std::string& name,
+ const std::string& type) const {
return helper_.GetInfoAsValue(name, type);
}
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 27c1aaa..e9b4ae9 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -12,6 +12,7 @@
#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
#include "base/threading/platform_thread.h"
+#include "base/values.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/base/net_log_unittest.h"
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 72cb500..27e6f03 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -24,7 +24,10 @@
#include "net/socket/client_socket_pool_histograms.h"
class GURL;
+
+namespace base {
class Value;
+}
namespace net {
@@ -160,7 +163,7 @@ class ClientSocketPoolManager : public base::NonThreadSafe,
// Creates a Value summary of the state of the socket pools. The caller is
// responsible for deleting the returned value.
- Value* SocketPoolInfoToValue() const;
+ base::Value* SocketPoolInfoToValue() const;
// CertDatabase::Observer methods:
virtual void OnUserCertAdded(const X509Certificate* cert);
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index e17273f..c160eda 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -147,9 +147,10 @@ class NET_TEST SOCKSClientSocketPool : public ClientSocketPool {
virtual LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const;
- virtual DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type,
- bool include_nested_pools) const;
+ virtual base::DictionaryValue* GetInfoAsValue(
+ const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const;
virtual base::TimeDelta ConnectionTimeout() const;
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 8baab94..dec7e50 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -224,9 +224,10 @@ class NET_TEST SSLClientSocketPool : public ClientSocketPool,
virtual LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const;
- virtual DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type,
- bool include_nested_pools) const;
+ virtual base::DictionaryValue* GetInfoAsValue(
+ const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const;
virtual base::TimeDelta ConnectionTimeout() const;
diff --git a/net/socket/ssl_error_params.h b/net/socket/ssl_error_params.h
index ae546fe..c0d685a 100644
--- a/net/socket/ssl_error_params.h
+++ b/net/socket/ssl_error_params.h
@@ -16,7 +16,7 @@ class SSLErrorParams : public NetLog::EventParameters {
SSLErrorParams(int net_error, int ssl_lib_error);
virtual ~SSLErrorParams();
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const int net_error_;
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index a75b426..aa0932f 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -10,6 +10,7 @@
#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/values.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_log.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
index dab1679..bcd8703 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -176,9 +176,10 @@ class NET_TEST TransportClientSocketPool : public ClientSocketPool {
virtual LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const;
- virtual DictionaryValue* GetInfoAsValue(const std::string& name,
- const std::string& type,
- bool include_nested_pools) const;
+ virtual base::DictionaryValue* GetInfoAsValue(
+ const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const;
virtual base::TimeDelta ConnectionTimeout() const;
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 5fd3520..58e617b 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -172,7 +172,7 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>,
// Retrieves information on the current state of the SPDY session as a
// Value. Caller takes possession of the returned value.
- Value* GetInfoAsValue() const;
+ base::Value* GetInfoAsValue() const;
// Indicates whether the session is being reused after having successfully
// used to send/receive data in the past.
@@ -452,7 +452,7 @@ class NetLogSpdySynParameter : public NetLog::EventParameters {
return headers_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
virtual ~NetLogSpdySynParameter();
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 99319ee..74b8874 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -99,7 +99,7 @@ class NET_API SpdySessionPool
// Creates a Value summary of the state of the spdy session pool. The caller
// responsible for deleting the returned value.
- Value* SpdySessionPoolInfoToValue() const;
+ base::Value* SpdySessionPoolInfoToValue() const;
SpdySettingsStorage* mutable_spdy_settings() { return &spdy_settings_; }
const SpdySettingsStorage& spdy_settings() const { return spdy_settings_; }
diff --git a/net/test/test_server.h b/net/test/test_server.h
index 81b0ad3..5efd6ba 100644
--- a/net/test/test_server.h
+++ b/net/test/test_server.h
@@ -24,9 +24,12 @@
#endif
class CommandLine;
-class DictionaryValue;
class GURL;
+namespace base {
+class DictionaryValue;
+}
+
namespace net {
class AddressList;
@@ -117,7 +120,7 @@ class TestServer {
const FilePath& document_root() const { return document_root_; }
const HostPortPair& host_port_pair() const;
- const DictionaryValue& server_data() const;
+ const base::DictionaryValue& server_data() const;
std::string GetScheme() const;
bool GetAddressList(AddressList* address_list) const WARN_UNUSED_RESULT;
@@ -171,7 +174,7 @@ class TestServer {
HostPortPair host_port_pair_;
// Holds the data sent from the server (e.g., port number).
- scoped_ptr<DictionaryValue> server_data_;
+ scoped_ptr<base::DictionaryValue> server_data_;
// Handle of the Python process running the test server.
base::ProcessHandle process_handle_;
diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h
index 19e2de2f..5a147dc 100644
--- a/net/url_request/url_request_netlog_params.h
+++ b/net/url_request/url_request_netlog_params.h
@@ -32,7 +32,7 @@ class NET_API URLRequestStartEventParameters : public NetLog::EventParameters {
return load_flags_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
const GURL url_;
generated by cgit v1.1 at 2025-05-17 22:01:30 +0000