Make sure PluginDataRemoverImpl::Init is executed after the constructor has finished.

content/browser/plugin_data_remover_impl.cc

Index: content/browser/plugin_data_remover_impl.cc
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index c41e9136c9ceb26fea5229268ba3233439535b74..ec1585f73799c12db5ccc07ef7b46f1133fa7aea 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -60,35 +60,38 @@ bool PluginDataRemover::IsSupported(webkit::WebPluginInfo* plugin) {
 class PluginDataRemoverImpl::Context
     : public PluginProcessHost::Client,
       public IPC::Channel::Listener,
-      public base::RefCountedThreadSafe<Context> {
+      public base::RefCountedThreadSafe<Context,
+                                        BrowserThread::DeleteOnIOThread> {
  public:
-  Context(const std::string& mime_type,
-          base::Time begin_time,
+  Context(base::Time begin_time,
           const content::ResourceContext& resource_context)
       : event_(new base::WaitableEvent(true, false)),
         begin_time_(begin_time),
         is_removing_(false),
         resource_context_(resource_context),
         channel_(NULL) {
+  }
+
+  virtual ~Context() {
+  }
+
+  // Initialize on the IO thread.
+  void Init(const std::string& mime_type) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    remove_start_time_ = base::Time::Now();
+    is_removing_ = true;
     // Balanced in OnChannelOpened or OnError. Exactly one them will eventually
     // be called, so we need to keep this object around until then.
     AddRef();
-    remove_start_time_ = base::Time::Now();
-    BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(&Context::Init, this, mime_type));
-
-    BrowserThread::PostDelayedTask(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(&Context::OnTimeout, this),
-        kRemovalTimeoutMs);
+    PluginService::GetInstance()->OpenChannelToNpapiPlugin(
+        0, 0, GURL(), GURL(), mime_type, this);
   }
 
-  virtual ~Context() {
-    if (channel_)
-      BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, channel_);
+  // Called when a timeout happens in order not to block the client
+  // indefinitely.
+  void OnTimeout() {
+    LOG_IF(ERROR, is_removing_) << "Timed out";
+    SignalDone();
   }
 
   // PluginProcessHost::Client methods.
@@ -145,18 +148,9 @@ class PluginDataRemoverImpl::Context
     }
   }
 
-
   base::WaitableEvent* event() { return event_.get(); }
 
  private:
-  // Initialize on the IO thread.
-  void Init(const std::string& mime_type) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    is_removing_ = true;
-    PluginService::GetInstance()->OpenChannelToNpapiPlugin(
-        0, 0, GURL(), GURL(), mime_type, this);
-  }
-
   // Connects the client side of a newly opened plug-in channel.
   void ConnectToChannel(const IPC::ChannelHandle& handle) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -165,8 +159,8 @@ class PluginDataRemoverImpl::Context
     if (!is_removing_)
       return;
 
-    DCHECK(!channel_);
-    channel_ = new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this);
+    DCHECK(!channel_.get());
+    channel_.reset(new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this));
     if (!channel_->Connect()) {
       NOTREACHED() << "Couldn't connect to plugin";
       SignalDone();
@@ -190,13 +184,6 @@ class PluginDataRemoverImpl::Context
     SignalDone();
   }
 
-  // Called when a timeout happens in order not to block the client
-  // indefinitely.
-  void OnTimeout() {
-    LOG_IF(ERROR, is_removing_) << "Timed out";
-    SignalDone();
-  }
-
   // Signals that we are finished with removing data (successful or not). This
   // method is safe to call multiple times.
   void SignalDone() {
@@ -217,10 +204,9 @@ class PluginDataRemoverImpl::Context
   // The resource context for the profile.
   const content::ResourceContext& resource_context_;
 
-  // We own the channel, but it's used on the IO thread, so it needs to be
-  // deleted there. It's NULL until we have opened a connection to the plug-in
+  // The channel is NULL until we have opened a connection to the plug-in
   // process.
-  IPC::Channel* channel_;
+  scoped_ptr<IPC::Channel> channel_;
 };
 
 
@@ -236,6 +222,17 @@ PluginDataRemoverImpl::~PluginDataRemoverImpl() {
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
-  context_ = new Context(mime_type_, begin_time, resource_context_);
+  context_ = new Context(begin_time, resource_context_);
+  BrowserThread::PostTask(

[jam, 2011/12/07 21:57:12]

nit: usually this is solved by having an Init function on the refcounted object,
and it can do the calls below, since they're an implementation detail of
Context. Here we would just call Context::Init() which does the code below.

[Bernhard Bauer, 2011/12/08 09:43:17]

Done.

+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&Context::Init, context_, mime_type_));
+
+  BrowserThread::PostDelayedTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&Context::OnTimeout, context_),
+      kRemovalTimeoutMs);
+
   return context_->event();
 }