OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser/child_process_launcher.h" | 5 #include "content/browser/child_process_launcher.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/i18n/icu_util.h" | 10 #include "base/i18n/icu_util.h" |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 tracked_objects::ScopedTracker tracking_profile2( | 490 tracked_objects::ScopedTracker tracking_profile2( |
491 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 491 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
492 "465841 ChildProcessLauncher::Context::Notify::ProcessLaunched")); | 492 "465841 ChildProcessLauncher::Context::Notify::ProcessLaunched")); |
493 client_->OnProcessLaunched(); | 493 client_->OnProcessLaunched(); |
494 } else { | 494 } else { |
495 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/465841 | 495 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/465841 |
496 // is fixed. | 496 // is fixed. |
497 tracked_objects::ScopedTracker tracking_profile3( | 497 tracked_objects::ScopedTracker tracking_profile3( |
498 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 498 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
499 "465841 ChildProcessLauncher::Context::Notify::ProcessFailed")); | 499 "465841 ChildProcessLauncher::Context::Notify::ProcessFailed")); |
| 500 termination_status_ = base::TERMINATION_STATUS_LAUNCH_FAILED; |
500 client_->OnProcessLaunchFailed(); | 501 client_->OnProcessLaunchFailed(); |
501 } | 502 } |
502 } | 503 } |
503 | 504 |
504 bool ChildProcessLauncher::IsStarting() { | 505 bool ChildProcessLauncher::IsStarting() { |
505 // TODO(crbug.com/469248): This fails in some tests. | 506 // TODO(crbug.com/469248): This fails in some tests. |
506 // DCHECK(CalledOnValidThread()); | 507 // DCHECK(CalledOnValidThread()); |
507 return starting_; | 508 return starting_; |
508 } | 509 } |
509 | 510 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 } | 542 } |
542 | 543 |
543 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest( | 544 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest( |
544 Client* client) { | 545 Client* client) { |
545 Client* ret = client_; | 546 Client* ret = client_; |
546 client_ = client; | 547 client_ = client; |
547 return ret; | 548 return ret; |
548 } | 549 } |
549 | 550 |
550 } // namespace content | 551 } // namespace content |
OLD | NEW |