[GCM] Fix memory leaks

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 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 "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
   user_list_.reset(new UserList(gcm_store_.get()));
   connection_factory_.reset(new ConnectionFactoryImpl(GURL(kMCSEndpoint),
                                                       network_session_,
                                                       net_log_.net_log()));
   mcs_client_.reset(new MCSClient(&clock_,
                                   connection_factory_.get(),
                                   gcm_store_.get()));
   state_ = LOADING;
 }
 
-void GCMClientImpl::OnLoadCompleted(const GCMStore::LoadResult& result) {
+void GCMClientImpl::OnLoadCompleted(scoped_ptr<GCMStore::LoadResult> result) {
   DCHECK_EQ(LOADING, state_);
 
-  if (!result.success) {
+  if (!result->success) {
     ResetState();
     return;
   }
 
-  user_list_->Initialize(result.serial_number_mappings);
+  user_list_->Initialize(result->serial_number_mappings);
 
-  device_checkin_info_.android_id = result.device_android_id;
-  device_checkin_info_.secret = result.device_security_token;
-  InitializeMCSClient(result);
+  device_checkin_info_.android_id = result->device_android_id;
+  device_checkin_info_.secret = result->device_security_token;
+  InitializeMCSClient(result.Pass());
   if (!device_checkin_info_.IsValid()) {
     device_checkin_info_.Reset();
     state_ = INITIAL_DEVICE_CHECKIN;
     StartCheckin(0, device_checkin_info_);
   } else {
     state_ = READY;
     StartMCSLogin();
   }
 }
 
-void GCMClientImpl::InitializeMCSClient(const GCMStore::LoadResult& result) {
+void GCMClientImpl::InitializeMCSClient(
+    scoped_ptr<GCMStore::LoadResult> result) {
   mcs_client_->Initialize(
       base::Bind(&GCMClientImpl::OnMCSError, base::Unretained(this)),
       base::Bind(&GCMClientImpl::OnMessageReceivedFromMCS,
                  base::Unretained(this)),
       base::Bind(&GCMClientImpl::OnMessageSentToMCS, base::Unretained(this)),
-      result);
+      result.Pass());
 }
 
 void GCMClientImpl::OnFirstTimeDeviceCheckinCompleted(
     const CheckinInfo& checkin_info) {
   DCHECK(!device_checkin_info_.IsValid());
 
   state_ = READY;
   device_checkin_info_.android_id = checkin_info.android_id;
   device_checkin_info_.secret = checkin_info.secret;
   gcm_store_->SetDeviceCredentials(
@@ skipping 183 matching lines @@
 }
 
 void GCMClientImpl::NotifyDelegateOnMessageReceived(
     GCMClient::Delegate* delegate,
     const std::string& app_id,
     const IncomingMessage& incoming_message) {
   delegate->OnMessageReceived(app_id, incoming_message);
 }
 
 }  // namespace gcm