Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: content/shell/renderer/webkit_test_runner.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/common/webkit_test_helpers.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/shell/renderer/webkit_test_runner.h" 5 #include "content/shell/renderer/webkit_test_runner.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <clocale> 8 #include <clocale>
9 #include <cmath> 9 #include <cmath>
10 10
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/debug/debugger.h" 13 #include "base/debug/debugger.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/md5.h" 15 #include "base/md5.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/strings/stringprintf.h" 19 #include "base/strings/stringprintf.h"
20 #include "base/strings/sys_string_conversions.h" 20 #include "base/strings/sys_string_conversions.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/time/time.h" 22 #include "base/time/time.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "content/public/common/url_constants.h" 24 #include "content/public/common/url_constants.h"
25 #include "content/public/common/web_preferences.h"
25 #include "content/public/renderer/render_view.h" 26 #include "content/public/renderer/render_view.h"
26 #include "content/public/renderer/render_view_visitor.h" 27 #include "content/public/renderer/render_view_visitor.h"
27 #include "content/public/test/layouttest_support.h" 28 #include "content/public/test/layouttest_support.h"
28 #include "content/shell/common/shell_messages.h" 29 #include "content/shell/common/shell_messages.h"
29 #include "content/shell/common/shell_switches.h" 30 #include "content/shell/common/shell_switches.h"
30 #include "content/shell/common/webkit_test_helpers.h" 31 #include "content/shell/common/webkit_test_helpers.h"
31 #include "content/shell/renderer/gc_controller.h" 32 #include "content/shell/renderer/gc_controller.h"
32 #include "content/shell/renderer/leak_detector.h" 33 #include "content/shell/renderer/leak_detector.h"
33 #include "content/shell/renderer/shell_render_process_observer.h" 34 #include "content/shell/renderer/shell_render_process_observer.h"
34 #include "content/shell/renderer/test_runner/WebTask.h" 35 #include "content/shell/renderer/test_runner/WebTask.h"
(...skipping 21 matching lines...) Expand all
56 #include "third_party/WebKit/public/web/WebDocument.h" 57 #include "third_party/WebKit/public/web/WebDocument.h"
57 #include "third_party/WebKit/public/web/WebElement.h" 58 #include "third_party/WebKit/public/web/WebElement.h"
58 #include "third_party/WebKit/public/web/WebHistoryItem.h" 59 #include "third_party/WebKit/public/web/WebHistoryItem.h"
59 #include "third_party/WebKit/public/web/WebKit.h" 60 #include "third_party/WebKit/public/web/WebKit.h"
60 #include "third_party/WebKit/public/web/WebLeakDetector.h" 61 #include "third_party/WebKit/public/web/WebLeakDetector.h"
61 #include "third_party/WebKit/public/web/WebLocalFrame.h" 62 #include "third_party/WebKit/public/web/WebLocalFrame.h"
62 #include "third_party/WebKit/public/web/WebScriptSource.h" 63 #include "third_party/WebKit/public/web/WebScriptSource.h"
63 #include "third_party/WebKit/public/web/WebTestingSupport.h" 64 #include "third_party/WebKit/public/web/WebTestingSupport.h"
64 #include "third_party/WebKit/public/web/WebView.h" 65 #include "third_party/WebKit/public/web/WebView.h"
65 #include "ui/gfx/rect.h" 66 #include "ui/gfx/rect.h"
66 #include "webkit/common/webpreferences.h"
67 67
68 using blink::Platform; 68 using blink::Platform;
69 using blink::WebArrayBufferView; 69 using blink::WebArrayBufferView;
70 using blink::WebContextMenuData; 70 using blink::WebContextMenuData;
71 using blink::WebDevToolsAgent; 71 using blink::WebDevToolsAgent;
72 using blink::WebDeviceMotionData; 72 using blink::WebDeviceMotionData;
73 using blink::WebDeviceOrientationData; 73 using blink::WebDeviceOrientationData;
74 using blink::WebElement; 74 using blink::WebElement;
75 using blink::WebLocalFrame; 75 using blink::WebLocalFrame;
76 using blink::WebGamepads; 76 using blink::WebGamepads;
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 722
723 leak_detector_->TryLeakDetection(main_frame); 723 leak_detector_->TryLeakDetection(main_frame);
724 } 724 }
725 725
726 void WebKitTestRunner::ReportLeakDetectionResult( 726 void WebKitTestRunner::ReportLeakDetectionResult(
727 const LeakDetectionResult& report) { 727 const LeakDetectionResult& report) {
728 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); 728 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
729 } 729 }
730 730
731 } // namespace content 731 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/webkit_test_helpers.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698