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

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

Issue 17575007: Migrate TestRunner includes to new location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/renderer/webkit_test_runner.h ('k') | content/test/DEPS » ('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
(...skipping 22 matching lines...) Expand all
33 #include "third_party/WebKit/public/platform/Platform.h" 33 #include "third_party/WebKit/public/platform/Platform.h"
34 #include "third_party/WebKit/public/platform/WebCString.h" 34 #include "third_party/WebKit/public/platform/WebCString.h"
35 #include "third_party/WebKit/public/platform/WebPoint.h" 35 #include "third_party/WebKit/public/platform/WebPoint.h"
36 #include "third_party/WebKit/public/platform/WebRect.h" 36 #include "third_party/WebKit/public/platform/WebRect.h"
37 #include "third_party/WebKit/public/platform/WebSize.h" 37 #include "third_party/WebKit/public/platform/WebSize.h"
38 #include "third_party/WebKit/public/platform/WebString.h" 38 #include "third_party/WebKit/public/platform/WebString.h"
39 #include "third_party/WebKit/public/platform/WebURL.h" 39 #include "third_party/WebKit/public/platform/WebURL.h"
40 #include "third_party/WebKit/public/platform/WebURLError.h" 40 #include "third_party/WebKit/public/platform/WebURLError.h"
41 #include "third_party/WebKit/public/platform/WebURLRequest.h" 41 #include "third_party/WebKit/public/platform/WebURLRequest.h"
42 #include "third_party/WebKit/public/platform/WebURLResponse.h" 42 #include "third_party/WebKit/public/platform/WebURLResponse.h"
43 #include "third_party/WebKit/public/testing/WebTask.h"
44 #include "third_party/WebKit/public/testing/WebTestInterfaces.h"
45 #include "third_party/WebKit/public/testing/WebTestProxy.h"
46 #include "third_party/WebKit/public/testing/WebTestRunner.h"
43 #include "third_party/WebKit/public/web/WebArrayBufferView.h" 47 #include "third_party/WebKit/public/web/WebArrayBufferView.h"
44 #include "third_party/WebKit/public/web/WebContextMenuData.h" 48 #include "third_party/WebKit/public/web/WebContextMenuData.h"
45 #include "third_party/WebKit/public/web/WebDataSource.h" 49 #include "third_party/WebKit/public/web/WebDataSource.h"
46 #include "third_party/WebKit/public/web/WebDevToolsAgent.h" 50 #include "third_party/WebKit/public/web/WebDevToolsAgent.h"
47 #include "third_party/WebKit/public/web/WebDeviceOrientation.h" 51 #include "third_party/WebKit/public/web/WebDeviceOrientation.h"
48 #include "third_party/WebKit/public/web/WebDocument.h" 52 #include "third_party/WebKit/public/web/WebDocument.h"
49 #include "third_party/WebKit/public/web/WebElement.h" 53 #include "third_party/WebKit/public/web/WebElement.h"
50 #include "third_party/WebKit/public/web/WebFrame.h" 54 #include "third_party/WebKit/public/web/WebFrame.h"
51 #include "third_party/WebKit/public/web/WebHistoryItem.h" 55 #include "third_party/WebKit/public/web/WebHistoryItem.h"
52 #include "third_party/WebKit/public/web/WebKit.h" 56 #include "third_party/WebKit/public/web/WebKit.h"
53 #include "third_party/WebKit/public/web/WebScriptSource.h" 57 #include "third_party/WebKit/public/web/WebScriptSource.h"
54 #include "third_party/WebKit/public/web/WebTestingSupport.h" 58 #include "third_party/WebKit/public/web/WebTestingSupport.h"
55 #include "third_party/WebKit/public/web/WebView.h" 59 #include "third_party/WebKit/public/web/WebView.h"
56 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Task.h"
57 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestInterfaces.h"
58 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h"
59 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestRunner.h"
60 #include "ui/gfx/rect.h" 60 #include "ui/gfx/rect.h"
61 #include "webkit/base/file_path_string_conversions.h" 61 #include "webkit/base/file_path_string_conversions.h"
62 #include "webkit/common/webpreferences.h" 62 #include "webkit/common/webpreferences.h"
63 #include "webkit/glue/webkit_glue.h" 63 #include "webkit/glue/webkit_glue.h"
64 #include "webkit/renderer/media/webmediaplayer_impl.h" 64 #include "webkit/renderer/media/webmediaplayer_impl.h"
65 #include "webkit/renderer/media/webmediaplayer_ms.h" 65 #include "webkit/renderer/media/webmediaplayer_ms.h"
66 #include "webkit/renderer/media/webmediaplayer_params.h" 66 #include "webkit/renderer/media/webmediaplayer_params.h"
67 67
68 using WebKit::Platform; 68 using WebKit::Platform;
69 using WebKit::WebArrayBufferView; 69 using WebKit::WebArrayBufferView;
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 ->loadRequest(WebURLRequest(GURL("about:blank"))); 705 ->loadRequest(WebURLRequest(GURL("about:blank")));
706 Send(new ShellViewHostMsg_ResetDone(routing_id())); 706 Send(new ShellViewHostMsg_ResetDone(routing_id()));
707 } 707 }
708 708
709 void WebKitTestRunner::OnNotifyDone() { 709 void WebKitTestRunner::OnNotifyDone() {
710 render_view()->GetWebView()->mainFrame()->executeScript( 710 render_view()->GetWebView()->mainFrame()->executeScript(
711 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); 711 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
712 } 712 }
713 713
714 } // namespace content 714 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/webkit_test_runner.h ('k') | content/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698