summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 10:27:18 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 10:27:18 +0000
commitc7d58d6889f8c8c1a676593cae355326170522d0 (patch)
tree1dd70fb826fb4015321d767dc4bfc26dc1a59a8a /webkit/plugins
parent31c1959a53e1ae65660cf1284c46c8d944591c89 (diff)
downloadchromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.zip
chromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.tar.gz
chromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.tar.bz2
When clearing plugin data at shutdown, wait for it to finish.
Also, Add some browser tests for clearing plugin data and enable npapi_test_plugin on 64-bit Linux; apparently it's been fixed. BUG=58235, 18337, 26625 TEST=PluginDataRemoverTest.* Review URL: http://codereview.chromium.org/6308001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
-rw-r--r--webkit/plugins/npapi/test/plugin_client.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/plugins/npapi/test/plugin_client.cc
index 0b28250..527485d 100644
--- a/webkit/plugins/npapi/test/plugin_client.cc
+++ b/webkit/plugins/npapi/test/plugin_client.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -35,6 +35,7 @@ NPError PluginClient::GetEntryPoints(NPPluginFuncs* pFuncs) {
pFuncs->setvalue = NPP_SetValue;
pFuncs->javaClass = NULL;
pFuncs->urlredirectnotify = NPP_URLRedirectNotify;
+ pFuncs->clearsitedata = NPP_ClearSiteData;
return NPERR_NO_ERROR;
}
@@ -237,4 +238,11 @@ void NPP_URLRedirectNotify(NPP instance, const char* url, int32_t status,
plugin->URLRedirectNotify(url, status, notify_data);
}
}
+
+NPError NPP_ClearSiteData(const char* site,
+ uint64 flags,
+ uint64 max_age) {
+ LOG(INFO) << "NPP_ClearSiteData called";
+ return NPERR_NO_ERROR;
+}
} // extern "C"