summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_data_remover.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:49:09 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:49:09 +0000
commit4befe759d0281fb6ac017ac4a1fbbad75380ccb8 (patch)
tree57aba0209c811bf18fabd14e2aca30eb3d0d3d36 /chrome/browser/plugin_data_remover.cc
parenta2bf73fa21b1881c814e3c1d524232cb2e171c4b (diff)
downloadchromium_src-4befe759d0281fb6ac017ac4a1fbbad75380ccb8.zip
chromium_src-4befe759d0281fb6ac017ac4a1fbbad75380ccb8.tar.gz
chromium_src-4befe759d0281fb6ac017ac4a1fbbad75380ccb8.tar.bz2
Reland r100733 - Cancel plugin channel requests when the renderer goes away.
Logic: - Profile shutdown kills all renderer processes - When the RMF detects the channel closing, it kills off any plugin channel requests from: * PluginService (which needs to check the PluginServiceFilter on the FILE thread) * PluginProcessHost (which may need to wait for the channel to get established) - RMF uses the new OnPluginProcessHostFound() to cancel at the PluginService or PluginProcessHost Modified in Reland: * PluginProcessHost may be blocked on the browser<=>plugin channel to be established, OR on the plugin<=>renderer channel to be established. * Already covered the former case in the previous changelist (pending_requests_) but not the latter case (sent_requests_). * Cover both cases and add tests. BUG=94704 TEST=New PluginService tests Review URL: http://codereview.chromium.org/7887027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_data_remover.cc')
-rw-r--r--chrome/browser/plugin_data_remover.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc
index 5b06586..debac0b 100644
--- a/chrome/browser/plugin_data_remover.cc
+++ b/chrome/browser/plugin_data_remover.cc
@@ -24,9 +24,9 @@
namespace {
-const char* kFlashMimeType = "application/x-shockwave-flash";
+const char kFlashMimeType[] = "application/x-shockwave-flash";
// The minimum Flash Player version that implements NPP_ClearSiteData.
-const char* kMinFlashVersion = "10.3";
+const char kMinFlashVersion[] = "10.3";
const int64 kRemovalTimeoutMs = 10000;
const uint64 kClearAllData = 0;
@@ -97,6 +97,13 @@ void PluginDataRemover::SetPluginInfo(
const webkit::WebPluginInfo& info) {
}
+void PluginDataRemover::OnFoundPluginProcessHost(
+ PluginProcessHost* host) {
+}
+
+void PluginDataRemover::OnSentPluginChannelRequest() {
+}
+
void PluginDataRemover::OnChannelOpened(const IPC::ChannelHandle& handle) {
ConnectToChannel(handle);
// Balancing the AddRef call in StartRemoving.