Policy: Re-enabled plugin still disabled

chrome/browser/automation/testing_automation_provider.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/browser/automation/testing_automation_provider.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/thread_restrictions.h"
@@ skipping 2618 matching lines @@
        it++) {
     DownloadItem* curr_item = *it;
     if (curr_item->id() == id) {
       selected_item = curr_item;
       break;
     }
   }
   return selected_item;
 }
 
-} // namespace
+}  // namespace
 
 // See PerformActionOnDownload() in chrome/test/pyautolib/pyauto.py for sample
 // json input and output.
 void TestingAutomationProvider::PerformActionOnDownload(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   int id;
   std::string action;
 
@@ skipping 375 matching lines @@
     items->Append(item);
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->Set("plugins", items);  // return_value owns items.
 
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 // Sample json input:
 //    { "command": "EnablePlugin",
+//      "name": "Flash Player",
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::EnablePlugin(Browser* browser,
                                              DictionaryValue* args,
                                              IPC::Message* reply_message) {
   FilePath::StringType path;
+  string16 name;
   AutomationJSONReply reply(this, reply_message);
-  if (!args->GetString("path", &path)) {
-    reply.SendError("path not specified.");
+  if (!args->GetString("path", &path) || !args->GetString("name", &name)) {
+    reply.SendError("path or name not specified.");
     return;
   } else if (!webkit::npapi::PluginList::Singleton()->EnablePlugin(
-        FilePath(path))) {
+      FilePath(path), name)) {
     reply.SendError(StringPrintf("Could not enable plugin for path %s.",
                                  path.c_str()));
     return;
   }
   reply.SendSuccess(NULL);
 }
 
 // Sample json input:
 //    { "command": "DisablePlugin",
+//      "name": "Flash Player",
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::DisablePlugin(Browser* browser,
                                               DictionaryValue* args,
                                               IPC::Message* reply_message) {
   FilePath::StringType path;
+  string16 name;
   AutomationJSONReply reply(this, reply_message);
-  if (!args->GetString("path", &path)) {
-    reply.SendError("path not specified.");
+  if (!args->GetString("path", &path) || !args->GetString("name", &name)) {
+    reply.SendError("path or name not specified.");
     return;
   } else if (!webkit::npapi::PluginList::Singleton()->DisablePlugin(
-        FilePath(path))) {
+      FilePath(path), name)) {
     reply.SendError(StringPrintf("Could not disable plugin for path %s.",
                                  path.c_str()));
     return;
   }
   reply.SendSuccess(NULL);
 }
 
 // Sample json input:
 //    { "command": "SaveTabContents",
 //      "tab_index": 0,
@@ skipping 134 matching lines @@
   password_form.username_element = username_element;
   password_form.password_element = password_element;
   password_form.submit_element = submit_element;
   password_form.action = action_target;
   password_form.blacklisted_by_user = blacklist;
   password_form.date_created = time;
 
   return password_form;
 }
 
-} // namespace
+}  // namespace
 
 // See AddSavedPassword() in chrome/test/functional/pyauto.py for sample json
 // input.
 // Sample json output: { "password_added": true }
 void TestingAutomationProvider::AddSavedPassword(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   DictionaryValue* password_dict = NULL;
@@ skipping 1286 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }