Add an interface for Flash to clear its data.

content/browser/plugin_data_remover_impl.cc

 // Copyright (c) 2012 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 "content/browser/plugin_data_remover_impl.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/version.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/pepper_plugin_info.h"
+#include "ppapi/proxy/ppapi_messages.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 
 using content::BrowserThread;
 using content::ChildProcessHostImpl;
 
 namespace {
 
 const char kFlashMimeType[] = "application/x-shockwave-flash";
 // The minimum Flash Player version that implements NPP_ClearSiteData.
 const char kMinFlashVersion[] = "10.3";
@@ skipping 22 matching lines @@
   scoped_ptr<Version> version(
       webkit::npapi::PluginGroup::CreateVersionFromString(plugin_it->version));
   scoped_ptr<Version> min_version(
       Version::GetVersionFromString(kMinFlashVersion));
   bool rv = version.get() && min_version->CompareTo(*version) == -1;
   if (rv)
     *plugin = *plugin_it;
   return rv;
 }
 
-}
+}  // namespace content
 
 class PluginDataRemoverImpl::Context
     : public PluginProcessHost::Client,
+      public PpapiPluginProcessHost::BrokerClient,
       public IPC::Channel::Listener,
       public base::RefCountedThreadSafe<Context,
                                         BrowserThread::DeleteOnIOThread> {
  public:
   Context(base::Time begin_time,
           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() {
   }
 
   void Init(const std::string& mime_type) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&Context::InitOnIOThread, this, mime_type));
     BrowserThread::PostDelayedTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&Context::OnTimeout, this),
         base::TimeDelta::FromMilliseconds(kRemovalTimeoutMs));
   }
 
-  // Initialize on the IO thread.
   void InitOnIOThread(const std::string& mime_type) {
+    PluginServiceImpl* plugin_service = PluginServiceImpl::GetInstance();
+
+    // Get the plugin file path.
+    std::vector<webkit::WebPluginInfo> plugins;
+    plugin_service->GetPluginInfoArray(
+        GURL(), mime_type, false, &plugins, NULL);
+    if (plugins.empty()) {
+      NOTREACHED();
+      return;
+    }
+    FilePath plugin_path = plugins[0].path;
+
     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();
-    PluginServiceImpl::GetInstance()->OpenChannelToNpapiPlugin(
-        0, 0, GURL(), GURL(), mime_type, this);
+
+    content::PepperPluginInfo* pepper_info =
+        plugin_service->GetRegisteredPpapiPluginInfo(plugin_path);
+    if (pepper_info) {
+      // Use the broker since we run this function outside the sandbox.
+      plugin_service->OpenChannelToPpapiBroker(plugin_path, this);
+    } else {
+      plugin_service->OpenChannelToNpapiPlugin(
+          0, 0, GURL(), GURL(), mime_type, this);
+    }
   }
 
   // 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.
@@ skipping 13 matching lines @@
   virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE {
   }
 
   virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {
   }
 
   virtual void OnSentPluginChannelRequest() OVERRIDE {
   }
 
   virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE {
-    ConnectToChannel(handle);
+    ConnectToChannel(handle, false);
     // Balancing the AddRef call.
     Release();
   }
 
   virtual void OnError() OVERRIDE {
     LOG(ERROR) << "Couldn't open plugin channel";
     SignalDone();
     // Balancing the AddRef call.
     Release();
   }
 
+  // PpapiPluginProcessHost::BrokerClient implementation.
+  virtual void GetChannelInfo(base::ProcessHandle* renderer_handle,
+                              int* renderer_id) OVERRIDE {
+    *renderer_id = 0;
+  }
+
+  virtual void OnChannelOpened(
+      base::ProcessHandle plugin_process_handle,
+      const IPC::ChannelHandle& channel_handle) OVERRIDE {
+    ConnectToChannel(channel_handle, true);
+    // Balancing the AddRef call.
+    Release();
+  }
+
   // IPC::Channel::Listener methods.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     IPC_BEGIN_MESSAGE_MAP(Context, message)
       IPC_MESSAGE_HANDLER(PluginHostMsg_ClearSiteDataResult,
                           OnClearSiteDataResult)
+      IPC_MESSAGE_HANDLER(PpapiHostMsg_ClearSiteDataResult,
+                          OnClearSiteDataResult)
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP()
 
     return true;
   }
 
   virtual void OnChannelError() OVERRIDE {
     if (is_removing_) {
       NOTREACHED() << "Channel error";
       SignalDone();
     }
   }
 
   base::WaitableEvent* event() { return event_.get(); }
 
  private:
   // Connects the client side of a newly opened plug-in channel.
-  void ConnectToChannel(const IPC::ChannelHandle& handle) {
+  void ConnectToChannel(const IPC::ChannelHandle& handle, bool is_ppapi) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
     // If we timed out, don't bother connecting.
     if (!is_removing_)
       return;
 
     DCHECK(!channel_.get());
     channel_.reset(new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this));
     if (!channel_->Connect()) {
       NOTREACHED() << "Couldn't connect to plugin";
       SignalDone();
       return;
     }
 
-    if (!channel_->Send(new PluginMsg_ClearSiteData(std::string(),
-                                                    kClearAllData,
-                                                    begin_time_))) {
+    uint64 max_age = begin_time_.is_null() ?
+        std::numeric_limits<uint64>::max() :
+        (base::Time::Now() - begin_time_).InSeconds();
+
+    IPC::Message* msg;
+    if (is_ppapi) {
+      FilePath profile_path;  // FIXME ========================================================

[Bernhard Bauer, 2012/04/10 20:13:44]

Can you make this a TODO?

+      msg = new PpapiMsg_ClearSiteData(profile_path, std::string(),
+                                       kClearAllData, max_age);
+    } else {
+      msg = new PluginMsg_ClearSiteData(std::string(), kClearAllData, max_age);
+    }
+    if (!channel_->Send(msg)) {
       NOTREACHED() << "Couldn't send ClearSiteData message";
       SignalDone();
       return;
     }
   }
 
-  // Handles the PluginHostMsg_ClearSiteDataResult message.
+  // Handles the *HostMsg_ClearSiteDataResult message.
   void OnClearSiteDataResult(bool success) {
     LOG_IF(ERROR, !success) << "ClearSiteData returned error";
     UMA_HISTOGRAM_TIMES("ClearPluginData.time",
                         base::Time::Now() - remove_start_time_);
     SignalDone();
   }
 
   // Signals that we are finished with removing data (successful or not). This
   // method is safe to call multiple times.
   void SignalDone() {
@@ skipping 29 matching lines @@
 PluginDataRemoverImpl::~PluginDataRemoverImpl() {
 }
 
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
   context_ = new Context(begin_time, resource_context_);
   context_->Init(mime_type_);
   return context_->event();
 }