Undoing revert, cl is not the cause of gcm crash on canary.

components/copresence/copresence_manager_impl.cc

 // 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.
 
 #include "components/copresence/copresence_manager_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #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"
 
 namespace {
 
 const int kPollTimerIntervalMs = 3000;   // milliseconds.
 const int kAudioCheckIntervalMs = 1000;  // milliseconds.
 
 }  // namespace
 
 namespace copresence {
 
 // Public functions.
 
 CopresenceManagerImpl::CopresenceManagerImpl(CopresenceDelegate* delegate)
     : delegate_(delegate),
       whispernet_init_callback_(base::Bind(
           &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>),
-      init_failed_(false) {
+      audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>) {
   DCHECK(delegate_);
   DCHECK(delegate_->GetWhispernetClient());
   delegate_->GetWhispernetClient()->Initialize(
       whispernet_init_callback_.callback());
 
-  rpc_handler_.reset(new RpcHandler(delegate_, directive_handler_.get()));
+  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()));
 }
 
 CopresenceManagerImpl::~CopresenceManagerImpl() {
   whispernet_init_callback_.Cancel();
 }
 
 // Returns false if any operations were malformed.
 void CopresenceManagerImpl::ExecuteReportRequest(
     const ReportRequest& request,
     const std::string& app_id,
@@ skipping 59 matching lines @@
   if (!directive_handler_->GetCurrentAudioToken(AUDIBLE).empty() &&
       !directive_handler_->IsAudioTokenHeard(AUDIBLE)) {
     delegate_->HandleStatusUpdate(AUDIO_FAIL);
   } else if (!directive_handler_->GetCurrentAudioToken(INAUDIBLE).empty() &&
              !directive_handler_->IsAudioTokenHeard(INAUDIBLE)) {
     delegate_->HandleStatusUpdate(AUDIO_FAIL);
   }
 }
 
 }  // namespace copresence