OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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" |
11 #include "base/debug_on_start.h" | 11 #include "base/debug/debug_on_start_win.h" |
12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
14 #include "base/md5.h" | 14 #include "base/md5.h" |
15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
16 #include "base/metrics/stats_table.h" | 16 #include "base/metrics/stats_table.h" |
17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
18 #include "base/string_util.h" | 18 #include "base/string_util.h" |
19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "gfx/codec/png_codec.h" | 21 #include "gfx/codec/png_codec.h" |
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
913 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 913 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
914 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 914 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
915 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 915 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
916 plugins->erase(plugins->begin() + i); | 916 plugins->erase(plugins->begin() + i); |
917 } | 917 } |
918 } | 918 } |
919 } | 919 } |
920 } | 920 } |
921 | 921 |
922 } // namespace webkit_glue | 922 } // namespace webkit_glue |
OLD | NEW |