Update our use of the NPAPI ClearSiteData API.

chrome/plugin/plugin_channel.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/plugin/plugin_channel.h"
 
 #include "base/command_line.h"
 #include "base/lock.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
@@ skipping 235 matching lines @@
 
 void PluginChannel::OnGenerateRouteID(int* route_id) {
   *route_id = GenerateRouteID();
 }
 
 int PluginChannel::GenerateRouteID() {
   static int last_id = 0;
   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();
   FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath);
   scoped_refptr<webkit::npapi::PluginLib> plugin_lib(
       webkit::npapi::PluginLib::CreatePluginLib(path));
   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;
         max_age = delta.InSeconds();
       } 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);
     }
   }
   Send(new PluginHostMsg_ClearSiteDataResult(success));
 }
 
 base::WaitableEvent* PluginChannel::GetModalDialogEvent(
     gfx::NativeViewId containing_window) {
   return filter_->GetModalDialogEvent(containing_window);
 }
@@ skipping 31 matching lines @@
 }
 
 bool PluginChannel::Init(MessageLoop* ipc_message_loop, bool create_pipe_now) {
   if (!PluginChannelBase::Init(ipc_message_loop, create_pipe_now))
     return false;
 
   channel_->AddFilter(filter_.get());
   return true;
 }