Fix ClearSiteData for Pepper Flash.

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/utf_string_conversions.h"
@@ skipping 91 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     remove_start_time_ = base::Time::Now();
     is_removing_ = true;
     // Balanced in On[Ppapi]ChannelOpened or OnError. Exactly one them will
     // eventually be called, so we need to keep this object around until then.
     AddRef();
 
     PepperPluginInfo* pepper_info =
         plugin_service->GetRegisteredPpapiPluginInfo(plugin_path);
     if (pepper_info) {
+      plugin_name_ = pepper_info->name;
       // 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.
@@ skipping 93 matching lines @@
       SignalDone();
       return;
     }
 
     uint64 max_age = begin_time_.is_null() ?
         std::numeric_limits<uint64>::max() :
         (base::Time::Now() - begin_time_).InSeconds();
 
     IPC::Message* msg;
     if (is_ppapi) {
-      // Pass the path as 8-bit on all platforms.
       FilePath profile_path =
           PepperFileMessageFilter::GetDataDirName(browser_context_path_);
+      // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc
+      // (which prepends the plugin name to the relative part of the path
+      // instead, with the absolute, profile-dependent part being enforced by
+      // the browser).
 #if defined(OS_WIN)
-      std::string path_utf8 = UTF16ToUTF8(profile_path.value());
+      FilePath plugin_data_path =
+          profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_)));
 #else
-      const std::string& path_utf8 = profile_path.value();
+      FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_));
 #endif
-      msg = new PpapiMsg_ClearSiteData(profile_path, path_utf8,
+      msg = new PpapiMsg_ClearSiteData(plugin_data_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;
     }
   }
@@ skipping 23 matching lines @@
   base::Time begin_time_;
   bool is_removing_;
 
   // Path for the current profile. Must be retrieved on the UI thread from the
   // browser context when we start so we can use it later on the I/O thread.
   FilePath browser_context_path_;
 
   // The resource context for the profile. Use only on the I/O thread.
   ResourceContext* resource_context_;
 
+  // The name of the plugin. Use only on the I/O thread.
+  std::string plugin_name_;
+
   // The channel is NULL until we have opened a connection to the plug-in
   // process.
   scoped_ptr<IPC::Channel> channel_;
 };
 
 
 PluginDataRemoverImpl::PluginDataRemoverImpl(BrowserContext* browser_context)
     : mime_type_(kFlashMimeType),
       browser_context_(browser_context) {
 }
 
 PluginDataRemoverImpl::~PluginDataRemoverImpl() {
 }
 
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
   context_ = new Context(begin_time, browser_context_);
   context_->Init(mime_type_);
   return context_->event();
 }
 
 }  // namespace content