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

Unified Diff: content/shell/webkit_test_controller.cc

Issue 12282041: [content shell] implement pathToLocalResource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/webkit_test_controller.cc
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc
index e761b568d4e75119448b2aac23e4f802794b6413..c2840a6b3f623df56d13f9fc0b42c4f766bc76e7 100644
--- a/content/shell/webkit_test_controller.cc
+++ b/content/shell/webkit_test_controller.cc
@@ -241,6 +241,10 @@ bool WebKitTestController::ResetAfterLayoutTest() {
return true;
}
+void WebKitTestController::SetTempPath(const base::FilePath& temp_path) {
+ temp_path_ = temp_path;
+}
+
void WebKitTestController::RendererUnresponsive() {
DCHECK(CalledOnValidThread());
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoTimeout))
@@ -302,6 +306,7 @@ void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) {
current_pid_ = base::GetProcId(render_view_host->GetProcess()->GetHandle());
ShellViewMsg_SetTestConfiguration_Params params;
params.current_working_directory = current_working_directory_;
+ params.temp_path = temp_path_;
params.test_url = test_url_;
params.enable_pixel_dumping = enable_pixel_dumping_;
params.layout_test_timeout = kTestTimeoutMilliseconds;

Powered by Google App Engine
This is Rietveld 408576698