Change mojo enums to be scoped enums in the generated C++ bindings.

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 <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "dbus/file_descriptor.h"  // nogncheck
 #endif  // defined(OS_CHROMEOS)
 
 namespace device {
 
 SerialIoHandler::SerialIoHandler(
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread_task_runner)
     : file_thread_task_runner_(file_thread_task_runner),
       ui_thread_task_runner_(ui_thread_task_runner) {
   options_.bitrate = 9600;
-  options_.data_bits = serial::DATA_BITS_EIGHT;
-  options_.parity_bit = serial::PARITY_BIT_NO;
-  options_.stop_bits = serial::STOP_BITS_ONE;
+  options_.data_bits = serial::DataBits::EIGHT;
+  options_.parity_bit = serial::ParityBit::NO;
+  options_.stop_bits = serial::StopBits::ONE;
   options_.cts_flow_control = false;
   options_.has_cts_flow_control = true;
 }
 
 SerialIoHandler::~SerialIoHandler() {
   DCHECK(CalledOnValidThread());
   Close();
 }
 
 void SerialIoHandler::Open(const std::string& port,
@@ skipping 51 matching lines @@
       base::Bind(&SerialIoHandler::FinishOpen, this, base::Passed(&file)));
 }
 
 #endif
 
 void SerialIoHandler::MergeConnectionOptions(
     const serial::ConnectionOptions& options) {
   if (options.bitrate) {
     options_.bitrate = options.bitrate;
   }
-  if (options.data_bits != serial::DATA_BITS_NONE) {
+  if (options.data_bits != serial::DataBits::NONE) {
     options_.data_bits = options.data_bits;
   }
-  if (options.parity_bit != serial::PARITY_BIT_NONE) {
+  if (options.parity_bit != serial::ParityBit::NONE) {
     options_.parity_bit = options.parity_bit;
   }
-  if (options.stop_bits != serial::STOP_BITS_NONE) {
+  if (options.stop_bits != serial::StopBits::NONE) {
     options_.stop_bits = options.stop_bits;
   }
   if (options.has_cts_flow_control) {
     DCHECK(options_.has_cts_flow_control);
     options_.cts_flow_control = options.cts_flow_control;
   }
 }
 
 void SerialIoHandler::StartOpen(
     const std::string& port,
@@ skipping 73 matching lines @@
   AddRef();
   WriteImpl();
 }
 
 void SerialIoHandler::ReadCompleted(int bytes_read,
                                     serial::ReceiveError error) {
   DCHECK(CalledOnValidThread());
   DCHECK(IsReadPending());
   scoped_ptr<WritableBuffer> pending_read_buffer =
       std::move(pending_read_buffer_);
-  if (error == serial::RECEIVE_ERROR_NONE) {
+  if (error == serial::ReceiveError::NONE) {
     pending_read_buffer->Done(bytes_read);
   } else {
-    pending_read_buffer->DoneWithError(bytes_read, error);
+    pending_read_buffer->DoneWithError(bytes_read, static_cast<int32_t>(error));
   }
   Release();
 }
 
 void SerialIoHandler::WriteCompleted(int bytes_written,
                                      serial::SendError error) {
   DCHECK(CalledOnValidThread());
   DCHECK(IsWritePending());
   scoped_ptr<ReadOnlyBuffer> pending_write_buffer =
       std::move(pending_write_buffer_);
-  if (error == serial::SEND_ERROR_NONE) {
+  if (error == serial::SendError::NONE) {
     pending_write_buffer->Done(bytes_written);
   } else {
-    pending_write_buffer->DoneWithError(bytes_written, error);
+    pending_write_buffer->DoneWithError(bytes_written,
+                                        static_cast<int32_t>(error));
   }
   Release();
 }
 
 bool SerialIoHandler::IsReadPending() const {
   DCHECK(CalledOnValidThread());
   return pending_read_buffer_ != NULL;
 }
 
 bool SerialIoHandler::IsWritePending() const {
@@ skipping 32 matching lines @@
 }
 
 void SerialIoHandler::QueueWriteCompleted(int bytes_written,
                                           serial::SendError error) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&SerialIoHandler::WriteCompleted, this, bytes_written, error));
 }
 
 }  // namespace device