| 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" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "skia/ext/bitmap_platform_device.h" | 27 #include "skia/ext/bitmap_platform_device.h" |
| 28 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
| 29 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
| 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec
t.h" | 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec
t.h" |
| 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationC
lientMock.h" |
| 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientM
ock.h" |
| 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControl
lerMock.h" |
| 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" |
| 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
| 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
| 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" |
| 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon
se.h" |
| 43 #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" | 44 #include "ui/gfx/codec/png_codec.h" |
| 45 #include "ui/gfx/size.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/user_agent.h" | 47 #include "webkit/glue/user_agent.h" |
| 48 #include "webkit/glue/webkit_glue.h" | 48 #include "webkit/glue/webkit_glue.h" |
| 49 #include "webkit/glue/webpreferences.h" | 49 #include "webkit/glue/webpreferences.h" |
| 50 #include "webkit/tools/test_shell/notification_presenter.h" | 50 #include "webkit/tools/test_shell/notification_presenter.h" |
| 51 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" | 51 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
| 52 #include "webkit/tools/test_shell/test_navigation_controller.h" | 52 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 return speech_input_controller_mock_.get(); | 617 return speech_input_controller_mock_.get(); |
| 618 } | 618 } |
| 619 | 619 |
| 620 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() { | 620 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() { |
| 621 if (!geolocation_client_mock_.get()) { | 621 if (!geolocation_client_mock_.get()) { |
| 622 geolocation_client_mock_.reset( | 622 geolocation_client_mock_.reset( |
| 623 WebKit::WebGeolocationClientMock::create()); | 623 WebKit::WebGeolocationClientMock::create()); |
| 624 } | 624 } |
| 625 return geolocation_client_mock_.get(); | 625 return geolocation_client_mock_.get(); |
| 626 } | 626 } |
| OLD | NEW |