| Index: chrome/plugin/plugin_channel.cc
|
| diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
|
| index 17f217d3951b14f396cba2ddd91fe8bd09d5745a..74a2ac0387c49615ffd6a8545a0407bd701631cd 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);
|
| }
|
| }
|
|
|