Index: components/copresence/copresence_manager_impl.cc |
diff --git a/components/copresence/copresence_manager_impl.cc b/components/copresence/copresence_manager_impl.cc |
index 2d5828a63cb5397abe39352659e45875d103e976..265b042faeef87c252fa7d2c2c9f897eef59f309 100644 |
--- a/components/copresence/copresence_manager_impl.cc |
+++ b/components/copresence/copresence_manager_impl.cc |
@@ -10,7 +10,6 @@ |
#include "base/strings/stringprintf.h" |
#include "base/timer/timer.h" |
#include "components/copresence/handlers/directive_handler.h" |
-#include "components/copresence/handlers/gcm_handler.h" |
#include "components/copresence/proto/rpcs.pb.h" |
#include "components/copresence/public/whispernet_client.h" |
#include "components/copresence/rpc/rpc_handler.h" |
@@ -32,22 +31,16 @@ CopresenceManagerImpl::CopresenceManagerImpl(CopresenceDelegate* delegate) |
&CopresenceManagerImpl::WhispernetInitComplete, |
// This callback gets cancelled when we are destroyed. |
base::Unretained(this))), |
- init_failed_(false), |
directive_handler_(new DirectiveHandler), |
poll_timer_(new base::RepeatingTimer<CopresenceManagerImpl>), |
- audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>) { |
+ audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>), |
+ init_failed_(false) { |
DCHECK(delegate_); |
DCHECK(delegate_->GetWhispernetClient()); |
delegate_->GetWhispernetClient()->Initialize( |
whispernet_init_callback_.callback()); |
- if (delegate->GetGCMDriver()) |
- gcm_handler_.reset(new GCMHandler(delegate->GetGCMDriver(), |
- directive_handler_.get())); |
- |
- rpc_handler_.reset(new RpcHandler(delegate, |
- directive_handler_.get(), |
- gcm_handler_.get())); |
+ rpc_handler_.reset(new RpcHandler(delegate_, directive_handler_.get())); |
} |
CopresenceManagerImpl::~CopresenceManagerImpl() { |