Replace deprecated base::NonThreadSafe in content/browser in favor of SequenceChecker.

content/browser/child_process_launcher.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/child_process_launcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
@@ skipping 23 matching lines @@
       broker_client_invitation_(std::move(broker_client_invitation)),
       process_error_callback_(process_error_callback),
 #if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) ||  \
     defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
     defined(UNDEFINED_SANITIZER)
       terminate_child_on_shutdown_(false),
 #else
       terminate_child_on_shutdown_(terminate_on_shutdown),
 #endif
       weak_factory_(this) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   CHECK(BrowserThread::GetCurrentThreadIdentifier(&client_thread_id_));
 
   helper_ = new ChildProcessLauncherHelper(
                 child_process_id, client_thread_id_,
               std::move(command_line), std::move(delegate),
                        weak_factory_.GetWeakPtr(), terminate_on_shutdown);
   helper_->StartLaunchOnClientThread();
 }
 
 ChildProcessLauncher::~ChildProcessLauncher() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (process_.process.IsValid() && terminate_child_on_shutdown_) {
     // Client has gone away, so just kill the process.
     ChildProcessLauncherHelper::ForceNormalProcessTerminationAsync(
         std::move(process_));
   }
 }
 
 void ChildProcessLauncher::SetProcessPriority(bool background,
                                               bool boost_for_pending_views) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   base::Process to_pass = process_.process.Duplicate();
   BrowserThread::PostTask(
       BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
       base::Bind(
           &ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread,
           helper_, base::Passed(&to_pass), background,
           boost_for_pending_views));
 }
 
 void ChildProcessLauncher::Notify(
     ChildProcessLauncherHelper::Process process,
     mojo::edk::ScopedPlatformHandle server_handle,
     int error_code) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   starting_ = false;
   process_ = std::move(process);
 
   // Take ownership of the broker client invitation here so it's destroyed when
   // we go out of scope regardless of the outcome below.
   std::unique_ptr<mojo::edk::OutgoingBrokerClientInvitation> invitation =
       std::move(broker_client_invitation_);
   if (process_.process.IsValid()) {
     // Set up Mojo IPC to the new process.
     DCHECK(invitation);
     invitation->Send(
         process_.process.Handle(),
         mojo::edk::ConnectionParams(mojo::edk::TransportProtocol::kLegacy,
                                     std::move(server_handle)),
         process_error_callback_);
     client_->OnProcessLaunched();
   } else {
     termination_status_ = base::TERMINATION_STATUS_LAUNCH_FAILED;
 
     // NOTE: May delete |this|.
     client_->OnProcessLaunchFailed(error_code);
   }
 }
 
 bool ChildProcessLauncher::IsStarting() {
   // TODO(crbug.com/469248): This fails in some tests.
-  // DCHECK(CalledOnValidThread());
+  // DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return starting_;
 }
 
 const base::Process& ChildProcessLauncher::GetProcess() const {
   // TODO(crbug.com/469248): This fails in some tests.
-  // DCHECK(CalledOnValidThread());
+  // DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return process_.process;
 }
 
 base::TerminationStatus ChildProcessLauncher::GetChildTerminationStatus(
     bool known_dead,
     int* exit_code) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!process_.process.IsValid()) {
     // Process is already gone, so return the cached termination status.
     if (exit_code)
       *exit_code = exit_code_;
     return termination_status_;
   }
 
   termination_status_ =
       helper_->GetTerminationStatus(process_, known_dead, &exit_code_);
   if (exit_code)
@@ skipping 45 matching lines @@
 #endif  // OS_ANDROID
 
 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
     Client* client) {
   Client* ret = client_;
   client_ = client;
   return ret;
 }
 
 }  // namespace content