diff options
author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 12:43:36 +0000 |
---|---|---|
committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 12:43:36 +0000 |
commit | a4b146fa78f4676a695f93ad4f27a7d6661cbdd3 (patch) | |
tree | 2bb81cd065fa9f50632b12c0d462af5fbd89364f /chrome/plugin | |
parent | bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d (diff) | |
download | chromium_src-a4b146fa78f4676a695f93ad4f27a7d6661cbdd3.zip chromium_src-a4b146fa78f4676a695f93ad4f27a7d6661cbdd3.tar.gz chromium_src-a4b146fa78f4676a695f93ad4f27a7d6661cbdd3.tar.bz2 |
Update our use of the NPAPI ClearSiteData API.
BUG=58235
TEST=none
Review URL: http://codereview.chromium.org/6148006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r-- | chrome/plugin/plugin_channel.cc | 11 | ||||
-rw-r--r-- | chrome/plugin/plugin_channel.h | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc index 17f217d..74a2ac0 100644 --- a/chrome/plugin/plugin_channel.cc +++ b/chrome/plugin/plugin_channel.cc @@ -253,8 +253,8 @@ int PluginChannel::GenerateRouteID() { return ++last_id; } -void PluginChannel::OnClearSiteData(uint64 flags, - const std::string& domain, +void PluginChannel::OnClearSiteData(const std::string& site, + uint64 flags, base::Time begin_time) { bool success = false; CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -264,10 +264,7 @@ void PluginChannel::OnClearSiteData(uint64 flags, if (plugin_lib.get()) { NPError err = plugin_lib->NP_Initialize(); if (err == NPERR_NO_ERROR) { - scoped_refptr<webkit::npapi::PluginInstance> instance( - plugin_lib->CreateInstance(std::string())); - - const char* domain_str = domain.empty() ? NULL : domain.c_str(); + const char* site_str = site.empty() ? NULL : site.c_str(); uint64 max_age; if (begin_time > base::Time()) { base::TimeDelta delta = base::Time::Now() - begin_time; @@ -275,7 +272,7 @@ void PluginChannel::OnClearSiteData(uint64 flags, } else { max_age = kuint64max; } - err = instance->NPP_ClearSiteData(flags, domain_str, max_age); + err = plugin_lib->NP_ClearSiteData(site_str, flags, max_age); success = (err == NPERR_NO_ERROR); } } diff --git a/chrome/plugin/plugin_channel.h b/chrome/plugin/plugin_channel.h index 102d4d6..6c561f3 100644 --- a/chrome/plugin/plugin_channel.h +++ b/chrome/plugin/plugin_channel.h @@ -76,8 +76,8 @@ class PluginChannel : public PluginChannelBase { void OnCreateInstance(const std::string& mime_type, int* instance_id); void OnDestroyInstance(int instance_id, IPC::Message* reply_msg); void OnGenerateRouteID(int* route_id); - void OnClearSiteData(uint64 flags, - const std::string& domain, + void OnClearSiteData(const std::string& site, + uint64 flags, base::Time begin_time); std::vector<scoped_refptr<WebPluginDelegateStub> > plugin_stubs_; |