| OLD | NEW |
| 1 // Copyright (c) 2011 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/debug_on_start_win.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" | |
| 22 #include "gfx/size.h" | |
| 23 #include "googleurl/src/url_util.h" | 21 #include "googleurl/src/url_util.h" |
| 24 #include "grit/webkit_strings.h" | 22 #include "grit/webkit_strings.h" |
| 25 #include "net/base/mime_util.h" | 23 #include "net/base/mime_util.h" |
| 26 #include "net/base/net_util.h" | 24 #include "net/base/net_util.h" |
| 27 #include "net/url_request/url_request_file_job.h" | 25 #include "net/url_request/url_request_file_job.h" |
| 28 #include "net/url_request/url_request_filter.h" | 26 #include "net/url_request/url_request_filter.h" |
| 29 #include "skia/ext/bitmap_platform_device.h" | 27 #include "skia/ext/bitmap_platform_device.h" |
| 30 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
| 31 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
| 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec
t.h" | 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec
t.h" |
| 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" |
| 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" |
| 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" |
| 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" |
| 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" |
| 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
| 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |
| 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" |
| 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" |
| 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" |
| 45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 44 #include "ui/gfx/codec/png_codec.h" |
| 45 #include "ui/gfx/size.h" |
| 46 #include "webkit/glue/glue_serialize.h" | 46 #include "webkit/glue/glue_serialize.h" |
| 47 #include "webkit/glue/webkit_glue.h" | 47 #include "webkit/glue/webkit_glue.h" |
| 48 #include "webkit/glue/webpreferences.h" | 48 #include "webkit/glue/webpreferences.h" |
| 49 #include "webkit/plugins/npapi/plugin_list.h" | 49 #include "webkit/plugins/npapi/plugin_list.h" |
| 50 #include "webkit/plugins/npapi/webplugininfo.h" | 50 #include "webkit/plugins/npapi/webplugininfo.h" |
| 51 #include "webkit/tools/test_shell/notification_presenter.h" | 51 #include "webkit/tools/test_shell/notification_presenter.h" |
| 52 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" | 52 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
| 53 #include "webkit/tools/test_shell/test_navigation_controller.h" | 53 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| 54 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" | 54 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" |
| 55 #include "webkit/tools/test_shell/test_shell_devtools_client.h" | 55 #include "webkit/tools/test_shell/test_shell_devtools_client.h" |
| (...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 895 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
| 896 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 896 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
| 897 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 897 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
| 898 plugins->erase(plugins->begin() + i); | 898 plugins->erase(plugins->begin() + i); |
| 899 } | 899 } |
| 900 } | 900 } |
| 901 } | 901 } |
| 902 } | 902 } |
| 903 | 903 |
| 904 } // namespace webkit_glue | 904 } // namespace webkit_glue |
| OLD | NEW |