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

Unified Diff: net/socket/socks_client_socket_pool.cc

Issue 15662008: Make net and ipc explicitly use the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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 | « net/socket/socket_net_log_params.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket_pool.cc
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index 5e34cd09a77e5c1851a4ead71c7f0ae6a499bcaf..ad541ce0e7204c1b70ee194ba7202c1ad9780e35 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));
« no previous file with comments | « net/socket/socket_net_log_params.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698