Remove weak_ptr from CopresenceManager.

components/copresence/copresence_manager.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/public/copresence_manager.h"
 
 #include "base/bind.h"
 #include "components/copresence/copresence_manager_impl.h"
 #include "components/copresence/rpc/rpc_handler.h"
 
 namespace copresence {
 
 // static
 scoped_ptr<CopresenceManager> CopresenceManager::Create(
     CopresenceDelegate* delegate) {
   CopresenceManagerImpl* manager = new CopresenceManagerImpl(delegate);
 
   manager->pending_init_operations_++;
   manager->rpc_handler_.reset(new RpcHandler(delegate));
   manager->rpc_handler_->Initialize(
       base::Bind(&CopresenceManagerImpl::InitStepComplete,
                  // This is safe because the manager owns the RpcHandler.
                  base::Unretained(manager),
                  "Copresence device registration"));
 
+  // This callback will be canceled on manager's destruction, hence unretained
+  // is safe to use here.
+  manager->init_callback_.Reset(

[Daniel Erat, 2014/08/28 21:32:41]

i'm missing some background here, but what's the reason for this file? it seems
strange to have it accessing internals that are part of CopresenceManagerImpl.

[rkc, 2014/08/28 21:51:50]

This was written by Charlie while I was OOO. I am fairly confused about this
too, but since he is on paternity leave for a few weeks, I'm leaving the code as
is till he's back, assuming that he had a good reason to do this.

[Charlie, 2014/10/17 22:18:10]

This was in response to kalman@'s suggestion:

https://codereview.chromium.org/441103002/diff/40001/components/copresence/pu...

But there may be a cleaner way to do this. One option is to keep the impl class
at file scope:

https://code.google.com/p/chromium/codesearch#chromium/src/chromeos/dbus/sms_...

+      base::Bind(&CopresenceManagerImpl::InitStepComplete,
+                 base::Unretained(manager),
+                 "Whispernet proxy initialization"));
+
   manager->pending_init_operations_++;
   DCHECK(delegate->GetWhispernetClient());
   delegate->GetWhispernetClient()->Initialize(
-      base::Bind(&CopresenceManagerImpl::InitStepComplete,
-                 // We cannot cancel WhispernetClient initialization.
-                 // TODO(ckehoe): Get rid of this.
-                 manager->AsWeakPtr(),
-                 "Whispernet proxy initialization"));
+      manager->init_callback_.callback());
 
   return make_scoped_ptr<CopresenceManager>(manager);
 }
 
 }  // namespace copresence