diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:50:27 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:50:27 +0000 |
| commit | ea5ef4c89bd17065f32e1f294d8b922a0735fd25 (patch) | |
| tree | 530a4633c162b39a7149714d83b34a24ef1220e2 /net/socket/ssl_client_socket_pool.cc | |
| parent | abf7641841f0ade77b8339e3f1368c9f3ff711bd (diff) | |
| download | chromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.zip chromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.tar.gz chromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.tar.bz2 | |
Make net and ipc explicitly use the base namespace for Values.
They're currently relying on a using in values.h that we want to remove. I removed several usings in net for consistency.
BUG=
R=willchan@chromium.org
Review URL: https://codereview.chromium.org/15662008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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", |