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

components/copresence/copresence_manager_impl.h

 // 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.
 
 #ifndef COMPONENTS_COPRESENCE_COPRESENCE_MANAGER_IMPL_H_
 #define COMPONENTS_COPRESENCE_COPRESENCE_MANAGER_IMPL_H_
 
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/copresence/public/copresence_manager.h"
 
 namespace base {
 class Timer;
 }
 
 namespace net {
 class URLContextGetter;
 }
 
 namespace copresence {
 
 class DirectiveHandler;
+class GCMHandler;
 class ReportRequest;
 class RpcHandler;
 class WhispernetClient;
 
 // The implementation for CopresenceManager. Responsible primarily for
 // client-side initialization. The RpcHandler handles all the details
 // of interacting with the server.
 // TODO(rkc): Add tests for this class.
 class CopresenceManagerImpl : public CopresenceManager {
  public:
@@ skipping 18 matching lines @@
   // kAudioCheckIntervalMs milliseconds.
   void AudioCheck();
 
   // Belongs to the caller.
   CopresenceDelegate* const delegate_;
 
   // We use a CancelableCallback here because Whispernet
   // does not provide a way to unregister its init callback.
   base::CancelableCallback<void(bool)> whispernet_init_callback_;
 
-  // The |directive handler_| needs to destruct before |rpc_handler_|, do not
-  // change this order.
+  bool init_failed_;
+
+  // The GCMHandler must destruct before the DirectiveHandler,
+  // which must destruct before the RpcHandler. Do not change this order.
   scoped_ptr<RpcHandler> rpc_handler_;
   scoped_ptr<DirectiveHandler> directive_handler_;
+  scoped_ptr<GCMHandler> gcm_handler_;
 
   scoped_ptr<base::Timer> poll_timer_;
   scoped_ptr<base::Timer> audio_check_timer_;
 
-  bool init_failed_;
-
   DISALLOW_COPY_AND_ASSIGN(CopresenceManagerImpl);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_COPRESENCE_MANAGER_IMPL_H_