OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "device/serial/serial_device_enumerator.h" | 5 #include "device/serial/serial_device_enumerator.h" |
6 #include "device/serial/serial_service_impl.h" | 6 #include "device/serial/serial_service_impl.h" |
7 #include "device/serial/test_serial_io_handler.h" | 7 #include "device/serial/test_serial_io_handler.h" |
8 #include "extensions/renderer/api_test_base.h" | 8 #include "extensions/renderer/api_test_base.h" |
9 #include "grit/extensions_renderer_resources.h" | 9 #include "grit/extensions_renderer_resources.h" |
10 | 10 |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 397 |
398 virtual void SetUp() OVERRIDE { | 398 virtual void SetUp() OVERRIDE { |
399 ApiTestBase::SetUp(); | 399 ApiTestBase::SetUp(); |
400 env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS); | 400 env()->RegisterModule("async_waiter", IDR_ASYNC_WAITER_JS); |
401 env()->RegisterModule("data_receiver", IDR_DATA_RECEIVER_JS); | 401 env()->RegisterModule("data_receiver", IDR_DATA_RECEIVER_JS); |
402 env()->RegisterModule("data_sender", IDR_DATA_SENDER_JS); | 402 env()->RegisterModule("data_sender", IDR_DATA_SENDER_JS); |
403 env()->RegisterModule("serial", IDR_SERIAL_CUSTOM_BINDINGS_JS); | 403 env()->RegisterModule("serial", IDR_SERIAL_CUSTOM_BINDINGS_JS); |
404 env()->RegisterModule("serial_service", IDR_SERIAL_SERVICE_JS); | 404 env()->RegisterModule("serial_service", IDR_SERIAL_SERVICE_JS); |
405 env()->RegisterModule("device/serial/data_stream.mojom", | 405 env()->RegisterModule("device/serial/data_stream.mojom", |
406 IDR_DATA_STREAM_MOJOM_JS); | 406 IDR_DATA_STREAM_MOJOM_JS); |
| 407 env()->RegisterModule("device/serial/data_stream_serialization.mojom", |
| 408 IDR_DATA_STREAM_SERIALIZATION_MOJOM_JS); |
407 env()->RegisterModule("device/serial/serial.mojom", IDR_SERIAL_MOJOM_JS); | 409 env()->RegisterModule("device/serial/serial.mojom", IDR_SERIAL_MOJOM_JS); |
408 service_provider()->AddService<device::serial::SerialService>(base::Bind( | 410 service_provider()->AddService<device::serial::SerialService>(base::Bind( |
409 &SerialApiTest::CreateSerialService, base::Unretained(this))); | 411 &SerialApiTest::CreateSerialService, base::Unretained(this))); |
410 } | 412 } |
411 | 413 |
412 scoped_refptr<TestIoHandlerBase> io_handler_; | 414 scoped_refptr<TestIoHandlerBase> io_handler_; |
413 | 415 |
414 private: | 416 private: |
415 scoped_refptr<device::SerialIoHandler> GetIoHandler() { | 417 scoped_refptr<device::SerialIoHandler> GetIoHandler() { |
416 if (!io_handler_.get()) | 418 if (!io_handler_.get()) |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 | 610 |
609 TEST_F(SerialApiTest, SetPausedUnknownConnectionId) { | 611 TEST_F(SerialApiTest, SetPausedUnknownConnectionId) { |
610 RunTest("serial_unittest.js", "testSetPausedUnknownConnectionId"); | 612 RunTest("serial_unittest.js", "testSetPausedUnknownConnectionId"); |
611 } | 613 } |
612 | 614 |
613 TEST_F(SerialApiTest, SendUnknownConnectionId) { | 615 TEST_F(SerialApiTest, SendUnknownConnectionId) { |
614 RunTest("serial_unittest.js", "testSendUnknownConnectionId"); | 616 RunTest("serial_unittest.js", "testSendUnknownConnectionId"); |
615 } | 617 } |
616 | 618 |
617 } // namespace extensions | 619 } // namespace extensions |
OLD | NEW |