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

Side by Side Diff: content/shell/webkit_test_controller.cc

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
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/webkit_test_controller.h" 5 #include "content/shell/webkit_test_controller.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 WebKitTestController::~WebKitTestController() { 143 WebKitTestController::~WebKitTestController() {
144 DCHECK(CalledOnValidThread()); 144 DCHECK(CalledOnValidThread());
145 CHECK(instance_ == this); 145 CHECK(instance_ == this);
146 if (main_window_) 146 if (main_window_)
147 main_window_->Close(); 147 main_window_->Close();
148 instance_ = NULL; 148 instance_ = NULL;
149 } 149 }
150 150
151 bool WebKitTestController::PrepareForLayoutTest( 151 bool WebKitTestController::PrepareForLayoutTest(
152 const GURL& test_url, 152 const GURL& test_url,
153 const FilePath& current_working_directory, 153 const base::FilePath& current_working_directory,
154 bool enable_pixel_dumping, 154 bool enable_pixel_dumping,
155 const std::string& expected_pixel_hash) { 155 const std::string& expected_pixel_hash) {
156 DCHECK(CalledOnValidThread()); 156 DCHECK(CalledOnValidThread());
157 current_working_directory_ = current_working_directory; 157 current_working_directory_ = current_working_directory;
158 enable_pixel_dumping_ = enable_pixel_dumping; 158 enable_pixel_dumping_ = enable_pixel_dumping;
159 expected_pixel_hash_ = expected_pixel_hash; 159 expected_pixel_hash_ = expected_pixel_hash;
160 printer_->reset(); 160 printer_->reset();
161 printer_->PrintTextHeader(); 161 printer_->PrintTextHeader();
162 content::ShellBrowserContext* browser_context = 162 content::ShellBrowserContext* browser_context =
163 static_cast<content::ShellContentBrowserClient*>( 163 static_cast<content::ShellContentBrowserClient*>(
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CanOpenWindows, OnCanOpenWindows) 268 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CanOpenWindows, OnCanOpenWindows)
269 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ShowWebInspector, OnShowWebInspector) 269 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ShowWebInspector, OnShowWebInspector)
270 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseWebInspector, OnCloseWebInspector) 270 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseWebInspector, OnCloseWebInspector)
271 IPC_MESSAGE_HANDLER(ShellViewHostMsg_NotImplemented, OnNotImplemented) 271 IPC_MESSAGE_HANDLER(ShellViewHostMsg_NotImplemented, OnNotImplemented)
272 IPC_MESSAGE_UNHANDLED(handled = false) 272 IPC_MESSAGE_UNHANDLED(handled = false)
273 IPC_END_MESSAGE_MAP() 273 IPC_END_MESSAGE_MAP()
274 274
275 return handled; 275 return handled;
276 } 276 }
277 277
278 void WebKitTestController::PluginCrashed(const FilePath& plugin_path, 278 void WebKitTestController::PluginCrashed(const base::FilePath& plugin_path,
279 base::ProcessId plugin_pid) { 279 base::ProcessId plugin_pid) {
280 DCHECK(CalledOnValidThread()); 280 DCHECK(CalledOnValidThread());
281 printer_->AddErrorMessage( 281 printer_->AddErrorMessage(
282 base::StringPrintf("#CRASHED - plugin (pid %d)", plugin_pid)); 282 base::StringPrintf("#CRASHED - plugin (pid %d)", plugin_pid));
283 } 283 }
284 284
285 void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) { 285 void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) {
286 DCHECK(CalledOnValidThread()); 286 DCHECK(CalledOnValidThread());
287 // Might be kNullProcessHandle, in which case we will receive a notification 287 // Might be kNullProcessHandle, in which case we will receive a notification
288 // later when the RenderProcessHost was created. 288 // later when the RenderProcessHost was created.
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 492
493 void WebKitTestController::OnNotImplemented( 493 void WebKitTestController::OnNotImplemented(
494 const std::string& object_name, 494 const std::string& object_name,
495 const std::string& property_name) { 495 const std::string& property_name) {
496 printer_->AddErrorMessage( 496 printer_->AddErrorMessage(
497 std::string("FAIL: NOT IMPLEMENTED: ") + 497 std::string("FAIL: NOT IMPLEMENTED: ") +
498 object_name + "." + property_name); 498 object_name + "." + property_name);
499 } 499 }
500 500
501 } // namespace content 501 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/webkit_test_controller.h ('k') | content/shell/webkit_test_platform_support_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698