Chromium Code Reviews| Index: components/copresence/copresence_client.cc |
| diff --git a/components/copresence/copresence_client.cc b/components/copresence/copresence_client.cc |
| index 60e45e15d2156368eddf0e575f1812e6339e9dc6..4739fc7547e518be1898dffe304157fc76453ebe 100644 |
| --- a/components/copresence/copresence_client.cc |
| +++ b/components/copresence/copresence_client.cc |
| @@ -26,11 +26,10 @@ CopresenceClient::CopresenceClient(CopresenceClientDelegate* delegate) |
| : delegate_(delegate), init_failed_(false), pending_init_operations_(0) { |
| DVLOG(3) << "Initializing client."; |
| pending_init_operations_++; |
| - rpc_handler_.reset( |
| - new RpcHandler(delegate, |
| - base::Bind(&CopresenceClient::InitStepComplete, |
| - AsWeakPtr(), |
| - "Copresence device registration"))); |
| + rpc_handler_.reset(new RpcHandler(delegate)); |
| + rpc_handler_->Initialize(base::Bind(&CopresenceClient::InitStepComplete, |
| + AsWeakPtr(), |
|
willchan no longer on Chromium
2014/08/07 20:42:43
Why is AsWeakPtr() used here? Doesn't CopresenceCl
Charlie
2014/08/07 22:40:58
Removed.
|
| + "Copresence device registration")); |
| pending_init_operations_++; |
| delegate_->GetWhispernetClient()->Initialize( |
| @@ -76,7 +75,7 @@ void CopresenceClient::CompleteInitialization() { |
| return; |
| if (!init_failed_) |
| - rpc_handler_->ConnectToWhispernet(delegate_->GetWhispernetClient()); |
| + rpc_handler_->ConnectToWhispernet(); |
| for (std::vector<PendingRequest>::iterator request = |
| pending_requests_queue_.begin(); |