Index: components/copresence/copresence_client.cc |
diff --git a/components/copresence/copresence_client.cc b/components/copresence/copresence_client.cc |
index 60e45e15d2156368eddf0e575f1812e6339e9dc6..abe3ec05905b8592846d8711333ef787437fc485 100644 |
--- a/components/copresence/copresence_client.cc |
+++ b/components/copresence/copresence_client.cc |
@@ -1,6 +1,6 @@ |
// Copyright 2014 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
+// Use of this source code is governed by a BSD-style license |
+// that can be found in the LICENSE file. |
#include "components/copresence/public/copresence_client.h" |
@@ -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(), |
+ "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(); |