diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 19:39:50 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 19:39:50 +0000 |
| commit | 10833355fcdb440345d59f8e4757116d68cf7e0e (patch) | |
| tree | c06e630d60bc2b7741e4e089dec0e5990f1cdae4 /net/socket/client_socket_pool_base.cc | |
| parent | 8aca21a9ed0790fa63ab4c637d8112ee06b634a7 (diff) | |
| download | chromium_src-10833355fcdb440345d59f8e4757116d68cf7e0e.zip chromium_src-10833355fcdb440345d59f8e4757116d68cf7e0e.tar.gz chromium_src-10833355fcdb440345d59f8e4757116d68cf7e0e.tar.bz2 | |
Cleanup: Remove deprecated base::Value methods from net. Use base::Value too.
Review URL: https://chromiumcodereview.appspot.com/12209080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.cc')
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 7a02909..fd0fc2f 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -113,7 +113,7 @@ void ConnectJob::set_socket(StreamSocket* socket) { void ConnectJob::NotifyDelegateOfCompletion(int rv) { // The delegate will delete |this|. - Delegate *delegate = delegate_; + Delegate* delegate = delegate_; delegate_ = NULL; LogConnectCompletion(rv); @@ -589,9 +589,9 @@ LoadState ClientSocketPoolBaseHelper::GetLoadState( return LOAD_STATE_IDLE; } -DictionaryValue* ClientSocketPoolBaseHelper::GetInfoAsValue( +base::DictionaryValue* ClientSocketPoolBaseHelper::GetInfoAsValue( const std::string& name, const std::string& type) const { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetString("name", name); dict->SetString("type", type); dict->SetInteger("handed_out_socket_count", handed_out_socket_count_); @@ -604,11 +604,11 @@ DictionaryValue* ClientSocketPoolBaseHelper::GetInfoAsValue( if (group_map_.empty()) return dict; - DictionaryValue* all_groups_dict = new DictionaryValue(); + base::DictionaryValue* all_groups_dict = new base::DictionaryValue(); for (GroupMap::const_iterator it = group_map_.begin(); it != group_map_.end(); it++) { const Group* group = it->second; - DictionaryValue* group_dict = new DictionaryValue(); + base::DictionaryValue* group_dict = new base::DictionaryValue(); group_dict->SetInteger("pending_request_count", group->pending_requests().size()); @@ -619,21 +619,21 @@ DictionaryValue* ClientSocketPoolBaseHelper::GetInfoAsValue( group_dict->SetInteger("active_socket_count", group->active_socket_count()); - ListValue* idle_socket_list = new ListValue(); + base::ListValue* idle_socket_list = new base::ListValue(); std::list<IdleSocket>::const_iterator idle_socket; for (idle_socket = group->idle_sockets().begin(); idle_socket != group->idle_sockets().end(); idle_socket++) { int source_id = idle_socket->socket->NetLog().source().id; - idle_socket_list->Append(Value::CreateIntegerValue(source_id)); + idle_socket_list->Append(new base::FundamentalValue(source_id)); } group_dict->Set("idle_sockets", idle_socket_list); - ListValue* connect_jobs_list = new ListValue(); + base::ListValue* connect_jobs_list = new base::ListValue(); std::set<ConnectJob*>::const_iterator job = group->jobs().begin(); for (job = group->jobs().begin(); job != group->jobs().end(); job++) { int source_id = (*job)->net_log().source().id; - connect_jobs_list->Append(Value::CreateIntegerValue(source_id)); + connect_jobs_list->Append(new base::FundamentalValue(source_id)); } group_dict->Set("connect_jobs", connect_jobs_list); |