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

chrome/browser/extensions/api/copresence/copresence_api.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 "chrome/browser/extensions/api/copresence/copresence_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
+#include "chrome/browser/services/gcm/gcm_profile_service.h"
+#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/api/copresence.h"
 #include "components/copresence/copresence_manager_impl.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/enums.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/public/whispernet_client.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/event_router.h"
 
@@ skipping 118 matching lines @@
     const {
   // This won't be const if we use map[]
   const auto& key = api_keys_by_app_.find(app_id);
   return key == api_keys_by_app_.end() ? std::string() : key->second;
 }
 
 copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {
   return whispernet_client();
 }
 
+gcm::GCMDriver* CopresenceService::GetGCMDriver() {
+  return gcm::GCMProfileServiceFactory::GetForProfile(browser_context_)
+      ->driver();
+}
+
 template <>
 void
 BrowserContextKeyedAPIFactory<CopresenceService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
 // CopresenceExecuteFunction implementation.
 ExtensionFunction::ResponseAction CopresenceExecuteFunction::Run() {
   scoped_ptr<api::copresence::Execute::Params> params(
       api::copresence::Execute::Params::Create(*args_));
@@ skipping 51 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   // The token may be set to empty, to clear it.
   // TODO(ckehoe): Scope the auth token appropriately (crbug/423517).
   CopresenceService::GetFactoryInstance()->Get(browser_context())
       ->set_auth_token(params->token);
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions