diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 10:27:18 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 10:27:18 +0000 |
| commit | c7d58d6889f8c8c1a676593cae355326170522d0 (patch) | |
| tree | 1dd70fb826fb4015321d767dc4bfc26dc1a59a8a /webkit | |
| parent | 31c1959a53e1ae65660cf1284c46c8d944591c89 (diff) | |
| download | chromium_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')
| -rw-r--r-- | webkit/plugins/npapi/test/plugin_client.cc | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 5 |
2 files changed, 11 insertions, 4 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" diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 93fb40e..9a6e7a7 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -122,8 +122,7 @@ '<(DEPTH)/webkit/support/webkit_support.gyp:glue', ], 'conditions': [ - # http://code.google.com/p/chromium/issues/detail?id=18337 - ['target_arch!="x64" and target_arch!="arm"', { + ['target_arch!="arm"', { 'dependencies': [ 'copy_npapi_test_plugin', ], @@ -504,7 +503,7 @@ }, ], 'conditions': [ - ['target_arch!="x64" and target_arch!="arm"', { + ['target_arch!="arm"', { 'targets': [ { 'target_name': 'npapi_test_common', |