| Index: content/shell/webkit_test_controller.cc
|
| diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc
|
| index d812a9dc548e2677270aa8fd8567d3a5a9bd8960..257859b1d462cb0d2eb54714800ce0cf421c03ad 100644
|
| --- a/content/shell/webkit_test_controller.cc
|
| +++ b/content/shell/webkit_test_controller.cc
|
| @@ -150,7 +150,7 @@ WebKitTestController::~WebKitTestController() {
|
|
|
| bool WebKitTestController::PrepareForLayoutTest(
|
| const GURL& test_url,
|
| - const FilePath& current_working_directory,
|
| + const base::FilePath& current_working_directory,
|
| bool enable_pixel_dumping,
|
| const std::string& expected_pixel_hash) {
|
| DCHECK(CalledOnValidThread());
|
| @@ -275,7 +275,7 @@ bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
|
| return handled;
|
| }
|
|
|
| -void WebKitTestController::PluginCrashed(const FilePath& plugin_path,
|
| +void WebKitTestController::PluginCrashed(const base::FilePath& plugin_path,
|
| base::ProcessId plugin_pid) {
|
| DCHECK(CalledOnValidThread());
|
| printer_->AddErrorMessage(
|
|
|