Move off of deprecated base::NonThreadSafe in device/

device/serial/serial_io_handler.cc

 // Copyright 2014 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 "device/serial/serial_io_handler.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
       ui_thread_task_runner_(ui_thread_task_runner) {
   options_.bitrate = 9600;
   options_.data_bits = serial::DataBits::EIGHT;
   options_.parity_bit = serial::ParityBit::NO_PARITY;
   options_.stop_bits = serial::StopBits::ONE;
   options_.cts_flow_control = false;
   options_.has_cts_flow_control = true;
 }
 
 SerialIoHandler::~SerialIoHandler() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Close();
 }
 
 void SerialIoHandler::Open(const std::string& port,
                            const serial::ConnectionOptions& options,
                            const OpenCompleteCallback& callback) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(open_complete_.is_null());
   open_complete_ = callback;
   DCHECK(file_thread_task_runner_.get());
   DCHECK(ui_thread_task_runner_.get());
   MergeConnectionOptions(options);
   port_ = port;
 
 #if defined(OS_CHROMEOS)
   chromeos::PermissionBrokerClient* client =
       chromeos::DBusThreadManager::Get()->GetPermissionBrokerClient();
@@ skipping 29 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     const std::string& error_name,
     const std::string& error_message) {
   io_thread_task_runner->PostTask(
       FROM_HERE, base::Bind(&SerialIoHandler::ReportPathOpenError, this,
                             error_name, error_message));
 }
 
 void SerialIoHandler::ReportPathOpenError(const std::string& error_name,
                                           const std::string& error_message) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!open_complete_.is_null());
   LOG(ERROR) << "Permission broker failed to open '" << port_
              << "': " << error_name << ": " << error_message;
   OpenCompleteCallback callback = open_complete_;
   open_complete_.Reset();
   callback.Run(false);
 }
 
 #endif
 
@@ skipping 31 matching lines @@
   int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
               base::File::FLAG_EXCLUSIVE_READ | base::File::FLAG_WRITE |
               base::File::FLAG_EXCLUSIVE_WRITE | base::File::FLAG_ASYNC |
               base::File::FLAG_TERMINAL_DEVICE;
   base::File file(path, flags);
   io_task_runner->PostTask(FROM_HERE, base::Bind(&SerialIoHandler::FinishOpen,
                                                  this, base::Passed(&file)));
 }
 
 void SerialIoHandler::FinishOpen(base::File file) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!open_complete_.is_null());
   OpenCompleteCallback callback = open_complete_;
   open_complete_.Reset();
 
   if (!file.IsValid()) {
     LOG(ERROR) << "Failed to open serial port: "
                << base::File::ErrorToString(file.error_details());
     callback.Run(false);
     return;
   }
@@ skipping 19 matching lines @@
         base::Bind(&SerialIoHandler::DoClose, Passed(std::move(file_))));
   }
 }
 
 // static
 void SerialIoHandler::DoClose(base::File port) {
   // port closed by destructor.
 }
 
 void SerialIoHandler::Read(std::unique_ptr<WritableBuffer> buffer) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!IsReadPending());
   pending_read_buffer_ = std::move(buffer);
   read_canceled_ = false;
   AddRef();
   ReadImpl();
 }
 
 void SerialIoHandler::Write(std::unique_ptr<ReadOnlyBuffer> buffer) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!IsWritePending());
   pending_write_buffer_ = std::move(buffer);
   write_canceled_ = false;
   AddRef();
   WriteImpl();
 }
 
 void SerialIoHandler::ReadCompleted(int bytes_read,
                                     serial::ReceiveError error) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(IsReadPending());
   std::unique_ptr<WritableBuffer> pending_read_buffer =
       std::move(pending_read_buffer_);
   if (error == serial::ReceiveError::NONE) {
     pending_read_buffer->Done(bytes_read);
   } else {
     pending_read_buffer->DoneWithError(bytes_read, static_cast<int32_t>(error));
   }
   Release();
 }
 
 void SerialIoHandler::WriteCompleted(int bytes_written,
                                      serial::SendError error) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(IsWritePending());
   std::unique_ptr<ReadOnlyBuffer> pending_write_buffer =
       std::move(pending_write_buffer_);
   if (error == serial::SendError::NONE) {
     pending_write_buffer->Done(bytes_written);
   } else {
     pending_write_buffer->DoneWithError(bytes_written,
                                         static_cast<int32_t>(error));
   }
   Release();
 }
 
 bool SerialIoHandler::IsReadPending() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return pending_read_buffer_ != NULL;
 }
 
 bool SerialIoHandler::IsWritePending() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return pending_write_buffer_ != NULL;
 }
 
 void SerialIoHandler::CancelRead(serial::ReceiveError reason) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (IsReadPending() && !read_canceled_) {
     read_canceled_ = true;
     read_cancel_reason_ = reason;
     CancelReadImpl();
   }
 }
 
 void SerialIoHandler::CancelWrite(serial::SendError reason) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (IsWritePending() && !write_canceled_) {
     write_canceled_ = true;
     write_cancel_reason_ = reason;
     CancelWriteImpl();
   }
 }
 
 bool SerialIoHandler::ConfigurePort(const serial::ConnectionOptions& options) {
   MergeConnectionOptions(options);
   return ConfigurePortImpl();
 }
 
 void SerialIoHandler::QueueReadCompleted(int bytes_read,
                                          serial::ReceiveError error) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&SerialIoHandler::ReadCompleted, this, bytes_read, error));
 }
 
 void SerialIoHandler::QueueWriteCompleted(int bytes_written,
                                           serial::SendError error) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&SerialIoHandler::WriteCompleted, this, bytes_written, error));
 }
 
 }  // namespace device