Moving ProfileDestroyer from ref counting to WeakPtr.

Moving ProfileDestroyer from ref counting to WeakPtr.

BUG=245463
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203822

[nasko, 2013-05-31 14:40:15]

Hey Albert,
Can you take a look over this CL?
Thanks,
Nasko

[awong, 2013-06-03 16:35:13]

LGTM


On Fri, May 31, 2013 at 7:40 AM, <nasko@chromium.org> wrote:

> Reviewers: awong,
>
> Message:
> Hey Albert,
> Can you take a look over this CL?
> Thanks,
> Nasko
>
> Description:
> Moving ProfileDestroyer from ref counting to WeakPtr.
>
> BUG=245463
>
> Please review this at
https://codereview.chromium.**org/15854011/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/profiles/**profile_destroyer.h
>   M chrome/browser/profiles/**profile_destroyer.cc
>
>
> Index: chrome/browser/profiles/**profile_destroyer.cc
> diff --git a/chrome/browser/profiles/**profile_destroyer.cc
> b/chrome/browser/profiles/**profile_destroyer.cc
> index 7aa57d2203405a10fb31dae20272ba**0389e19868..**
> f26180b5718e3d66264095507a51f3**e205ab9c0c 100644
> --- a/chrome/browser/profiles/**profile_destroyer.cc
> +++ b/chrome/browser/profiles/**profile_destroyer.cc
> @@ -55,8 +55,7 @@ void ProfileDestroyer::**DestroyProfileWhenAppropriate(*
> *Profile* const profile) {
>    } else {
>      // The instance will destroy itself once all render process hosts
> referring
>      // to it are properly terminated.
> -    scoped_refptr<**ProfileDestroyer> profile_destroyer(
> -        new ProfileDestroyer(profile, hosts));
> +    new ProfileDestroyer(profile, hosts);
>    }
>  }
>
> @@ -87,7 +86,8 @@ ProfileDestroyer::**ProfileDestroyer(
>      const std::vector<content::**RenderProcessHost*>& hosts)
>      : timer_(false, false),
>        num_hosts_(0),
> -      profile_(profile) {
> +      profile_(profile),
> +      weak_ptr_factory_(this) {
>    if (pending_destroyers_ == NULL)
>      pending_destroyers_ = new std::vector<ProfileDestroyer*>**;
>    pending_destroyers_->push_**back(this);
> @@ -103,7 +103,8 @@ ProfileDestroyer::**ProfileDestroyer(
>    if (num_hosts_) {
>      timer_.Start(FROM_HERE,
>                   base::TimeDelta::FromSeconds(**kTimerDelaySeconds),
> -                 base::Bind(&ProfileDestroyer::**DestroyProfile, this));
> +                 base::Bind(&ProfileDestroyer::**DestroyProfile,
> +                            weak_ptr_factory_.GetWeakPtr()**));
>    }
>  }
>
> @@ -142,7 +143,8 @@ void ProfileDestroyer::Observe(int type,
>      // Delay the destruction one step further in case other observers of
> this
>      // notification need to look at the profile attached to the host.
>      base::MessageLoop::current()->**PostTask(
> -        FROM_HERE, base::Bind(&ProfileDestroyer::**DestroyProfile,
> this));
> +        FROM_HERE, base::Bind(
> +            &ProfileDestroyer::**DestroyProfile,
> weak_ptr_factory_.GetWeakPtr()**));
>    }
>  }
>
> @@ -162,6 +164,8 @@ void ProfileDestroyer::**DestroyProfile() {
>
>    // And stop the timer so we can be released early too.
>    timer_.Stop();
> +
> +  delete this;
>  }
>
>  // static
> Index: chrome/browser/profiles/**profile_destroyer.h
> diff --git a/chrome/browser/profiles/**profile_destroyer.h
> b/chrome/browser/profiles/**profile_destroyer.h
> index 62aa7c1348bc28552763d373b719dd**035eae740e..**
> 70a4752420d353cd31cf56af1949e5**249ee85cf7 100644
> --- a/chrome/browser/profiles/**profile_destroyer.h
> +++ b/chrome/browser/profiles/**profile_destroyer.h
> @@ -20,8 +20,7 @@ class RenderProcessHost;
>  // We use this class to destroy the off the record profile so that we can
> make
>  // sure it gets done asynchronously after all render process hosts are
> gone.
>  class ProfileDestroyer
> -    : public content::NotificationObserver,
> -      public base::RefCounted<**ProfileDestroyer> {
> +    : public content::NotificationObserver {
>   public:
>    static void DestroyProfileWhenAppropriate(**Profile* const profile);
>    static void DestroyOffTheRecordProfileNow(**Profile* const profile);
> @@ -61,6 +60,8 @@ class ProfileDestroyer
>
>    Profile* profile_;
>
> +  base::WeakPtrFactory<**ProfileDestroyer> weak_ptr_factory_;
> +
>    DISALLOW_COPY_AND_ASSIGN(**ProfileDestroyer);
>  };
>
>
>
>

[commit-bot: I haz the power, 2013-06-03 16:39:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nasko@chromium.org/15854011/1

[commit-bot: I haz the power, 2013-06-04 03:23:55]

Change committed as 203822