Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1101)

Unified Diff: extensions/browser/api/serial/serial_apitest.cc

Issue 401563002: Add a partial Mojo serial connection interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/serial/test_serial_io_handler.cc ('k') | extensions/browser/api/serial/serial_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/serial/serial_apitest.cc
diff --git a/extensions/browser/api/serial/serial_apitest.cc b/extensions/browser/api/serial/serial_apitest.cc
index c3c75ff3c2656b9de77101b4e2132549e3745c4d..4d81286fa0703e3fb30463f0849d871baf3e9ec9 100644
--- a/extensions/browser/api/serial/serial_apitest.cc
+++ b/extensions/browser/api/serial/serial_apitest.cc
@@ -5,6 +5,7 @@
#include <string>
#include "chrome/browser/extensions/extension_apitest.h"
+#include "device/serial/test_serial_io_handler.h"
#include "extensions/browser/api/serial/serial_api.h"
#include "extensions/browser/api/serial/serial_connection.h"
#include "extensions/browser/extension_function.h"
@@ -44,68 +45,15 @@ class FakeSerialGetDevicesFunction : public AsyncExtensionFunction {
virtual ~FakeSerialGetDevicesFunction() {}
};
-class FakeEchoSerialIoHandler : public device::SerialIoHandler {
+class FakeEchoSerialIoHandler : public device::TestSerialIoHandler {
public:
- explicit FakeEchoSerialIoHandler() : opened_(false) {}
-
- virtual void Open(const std::string& port,
- const OpenCompleteCallback& callback) OVERRIDE {
- DCHECK(!opened_);
- opened_ = true;
- callback.Run(true);
- }
-
- virtual bool ConfigurePort(
- const device::serial::ConnectionOptions& options) OVERRIDE {
- return true;
- }
-
- virtual void ReadImpl() OVERRIDE {}
-
- virtual void CancelReadImpl() OVERRIDE {
- QueueReadCompleted(0, read_cancel_reason());
- }
-
- virtual void WriteImpl() OVERRIDE {
- DCHECK(pending_read_buffer());
- DCHECK_LE(pending_write_buffer_len(), pending_read_buffer_len());
- memcpy(pending_read_buffer()->data(),
- pending_write_buffer()->data(),
- pending_write_buffer_len());
- QueueReadCompleted(pending_write_buffer_len(),
- device::serial::RECEIVE_ERROR_NONE);
- QueueWriteCompleted(pending_write_buffer_len(),
- device::serial::SEND_ERROR_NONE);
+ explicit FakeEchoSerialIoHandler() {
+ device_control_signals()->dcd = true;
+ device_control_signals()->cts = true;
+ device_control_signals()->ri = true;
+ device_control_signals()->dsr = true;
}
- virtual void CancelWriteImpl() OVERRIDE {
- QueueWriteCompleted(0, write_cancel_reason());
- }
-
- virtual device::serial::DeviceControlSignalsPtr GetControlSignals()
- const OVERRIDE {
- device::serial::DeviceControlSignalsPtr signals(
- device::serial::DeviceControlSignals::New());
- signals->dcd = true;
- signals->cts = true;
- signals->ri = true;
- signals->dsr = true;
- return signals.Pass();
- }
-
- virtual device::serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE {
- device::serial::ConnectionInfoPtr info(
- device::serial::ConnectionInfo::New());
- info->bitrate = 9600;
- info->data_bits = device::serial::DATA_BITS_EIGHT;
- info->parity_bit = device::serial::PARITY_BIT_NO;
- info->stop_bits = device::serial::STOP_BITS_ONE;
- info->cts_flow_control = false;
- return info.Pass();
- }
-
- virtual bool Flush() const OVERRIDE { return true; }
-
MOCK_METHOD1(SetControlSignals,
bool(const device::serial::HostControlSignals&));
@@ -113,8 +61,6 @@ class FakeEchoSerialIoHandler : public device::SerialIoHandler {
virtual ~FakeEchoSerialIoHandler() {}
private:
- bool opened_;
-
DISALLOW_COPY_AND_ASSIGN(FakeEchoSerialIoHandler);
};
« no previous file with comments | « device/serial/test_serial_io_handler.cc ('k') | extensions/browser/api/serial/serial_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698