OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #undef LOG | 5 #undef LOG |
6 | 6 |
7 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 // the copy in webkit.org's repository instead. | 881 // the copy in webkit.org's repository instead. |
882 const FilePath::StringType kPluginBlackList[] = { | 882 const FilePath::StringType kPluginBlackList[] = { |
883 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), | 883 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), |
884 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), | 884 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), |
885 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), | 885 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), |
886 }; | 886 }; |
887 for (int i = plugins->size() - 1; i >= 0; --i) { | 887 for (int i = plugins->size() - 1; i >= 0; --i) { |
888 WebPluginInfo plugin_info = plugins->at(i); | 888 WebPluginInfo plugin_info = plugins->at(i); |
889 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 889 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
890 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 890 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
891 NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 891 NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path, false); |
892 plugins->erase(plugins->begin() + i); | 892 plugins->erase(plugins->begin() + i); |
893 } | 893 } |
894 } | 894 } |
895 } | 895 } |
896 } | 896 } |
897 | 897 |
898 } // namespace webkit_glue | 898 } // namespace webkit_glue |
OLD | NEW |