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/threading/thread_restrictions.h"
@@ skipping 2567 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 368 matching lines @@
   ListValue* items = new ListValue;
   for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator it =
            plugins.begin();
        it != plugins.end();
        ++it) {
     DictionaryValue* item = new DictionaryValue;
     item->SetString("name", it->name);
     item->SetString("path", it->path.value());
     item->SetString("version", it->version);
     item->SetString("desc", it->desc);
-    item->SetBoolean("enabled", it->enabled);
+    item->SetBoolean("enabled", webkit::npapi::IsPluginEnabled(*it));
     // Add info about mime types.
     ListValue* mime_types = new ListValue();
     for (std::vector<webkit::npapi::WebPluginMimeType>::const_iterator type_it =
              it->mime_types.begin();
          type_it != it->mime_types.end();
          ++type_it) {
       DictionaryValue* mime_type = new DictionaryValue();
       mime_type->SetString("mimeType", type_it->mime_type);
       mime_type->SetString("description", type_it->description);
 
@@ skipping 17 matching lines @@
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 // Sample json input:
 //    { "command": "EnablePlugin",
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::EnablePlugin(Browser* browser,
                                              DictionaryValue* args,
                                              IPC::Message* reply_message) {
   FilePath::StringType path;
+  string16 name;

[jam, 2011/01/19 20:22:09]

nit: here and below, looks like name is unused?

[pastarmovj, 2011/01/19 23:39:17]

Done. Undone small changes to following lines that were not relevant too.

   AutomationJSONReply reply(this, reply_message);
   if (!args->GetString("path", &path)) {
-    reply.SendError("path not specified.");
+    reply.SendError("path or name not specified.");
     return;
   } else if (!webkit::npapi::PluginList::Singleton()->EnablePlugin(
-        FilePath(path))) {
+      FilePath(path))) {
     reply.SendError(StringPrintf("Could not enable plugin for path %s.",
                                  path.c_str()));
     return;
   }
   reply.SendSuccess(NULL);
 }
 
 // Sample json input:
 //    { "command": "DisablePlugin",
 //      "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.");
+    reply.SendError("path or name not specified.");
     return;
   } else if (!webkit::npapi::PluginList::Singleton()->DisablePlugin(
-        FilePath(path))) {
+      FilePath(path))) {
     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 1299 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);
 }