OLD | NEW |
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/base64.h" | 9 #include "base/base64.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 // Might be kNullProcessHandle, in which case we will receive a notification | 378 // Might be kNullProcessHandle, in which case we will receive a notification |
379 // later when the RenderProcessHost was created. | 379 // later when the RenderProcessHost was created. |
380 if (render_view_host->GetProcess()->GetHandle() != base::kNullProcessHandle) | 380 if (render_view_host->GetProcess()->GetHandle() != base::kNullProcessHandle) |
381 current_pid_ = base::GetProcId(render_view_host->GetProcess()->GetHandle()); | 381 current_pid_ = base::GetProcId(render_view_host->GetProcess()->GetHandle()); |
382 if (!send_configuration_to_next_host_) | 382 if (!send_configuration_to_next_host_) |
383 return; | 383 return; |
384 send_configuration_to_next_host_ = false; | 384 send_configuration_to_next_host_ = false; |
385 SendTestConfiguration(); | 385 SendTestConfiguration(); |
386 } | 386 } |
387 | 387 |
388 void WebKitTestController::RenderViewGone(base::TerminationStatus status) { | 388 void WebKitTestController::RenderProcessGone(base::TerminationStatus status) { |
389 DCHECK(CalledOnValidThread()); | 389 DCHECK(CalledOnValidThread()); |
390 if (current_pid_ != base::kNullProcessId) { | 390 if (current_pid_ != base::kNullProcessId) { |
391 printer_->AddErrorMessage(std::string("#CRASHED - renderer (pid ") + | 391 printer_->AddErrorMessage(std::string("#CRASHED - renderer (pid ") + |
392 base::IntToString(current_pid_) + ")"); | 392 base::IntToString(current_pid_) + ")"); |
393 } else { | 393 } else { |
394 printer_->AddErrorMessage("#CRASHED - renderer"); | 394 printer_->AddErrorMessage("#CRASHED - renderer"); |
395 } | 395 } |
396 DiscardMainWindow(); | 396 DiscardMainWindow(); |
397 } | 397 } |
398 | 398 |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 } | 614 } |
615 base::MessageLoop::current()->RunUntilIdle(); | 615 base::MessageLoop::current()->RunUntilIdle(); |
616 } | 616 } |
617 | 617 |
618 void WebKitTestController::OnResetDone() { | 618 void WebKitTestController::OnResetDone() { |
619 base::MessageLoop::current()->PostTask(FROM_HERE, | 619 base::MessageLoop::current()->PostTask(FROM_HERE, |
620 base::MessageLoop::QuitClosure()); | 620 base::MessageLoop::QuitClosure()); |
621 } | 621 } |
622 | 622 |
623 } // namespace content | 623 } // namespace content |
OLD | NEW |