diff options
author | serya@chromium.org <serya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 10:21:42 +0000 |
---|---|---|
committer | serya@chromium.org <serya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 10:21:42 +0000 |
commit | 1dff3e93163bc6929c2e1414b89cea3cf721f608 (patch) | |
tree | c2ca5982eb817428de5738db5c978c95af045bc4 /extensions/renderer/api | |
parent | b930bbfa802e9fa6b7d2a80fedf8730cd309d8fc (diff) | |
download | chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.zip chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.tar.gz chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.tar.bz2 |
Revert 286122 "Implement chrome.serial.getDevices() on top of th..."
Looks quilty in compilation failure: http://build.chromium.org/p/chromium/builders/Win/builds/22924
> Implement chrome.serial.getDevices() on top of the Mojo serial service.
>
> This does not change Chrome to use the new implementation.
>
> BUG=389016
>
> Review URL: https://codereview.chromium.org/391413005
TBR=sammc@chromium.org
Review URL: https://codereview.chromium.org/414333005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/renderer/api')
-rw-r--r-- | extensions/renderer/api/serial/DEPS | 3 | ||||
-rw-r--r-- | extensions/renderer/api/serial/serial_api_unittest.cc | 65 |
2 files changed, 0 insertions, 68 deletions
diff --git a/extensions/renderer/api/serial/DEPS b/extensions/renderer/api/serial/DEPS deleted file mode 100644 index e273c39..0000000 --- a/extensions/renderer/api/serial/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+device/serial", -] diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc deleted file mode 100644 index 3f551ca..0000000 --- a/extensions/renderer/api/serial/serial_api_unittest.cc +++ /dev/null @@ -1,65 +0,0 @@ -// 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_device_enumerator.h" -#include "device/serial/serial_service_impl.h" -#include "extensions/renderer/api_test_base.h" -#include "grit/extensions_renderer_resources.h" - -namespace extensions { - -namespace { - -class FakeSerialDeviceEnumerator : public device::SerialDeviceEnumerator { - virtual mojo::Array<device::serial::DeviceInfoPtr> GetDevices() OVERRIDE { - mojo::Array<device::serial::DeviceInfoPtr> result(3); - result[0] = device::serial::DeviceInfo::New(); - result[0]->path = "device"; - result[0]->vendor_id = 1234; - result[0]->has_vendor_id = true; - result[0]->product_id = 5678; - result[0]->has_product_id = true; - result[0]->display_name = "foo"; - result[1] = device::serial::DeviceInfo::New(); - result[1]->path = "another_device"; - // These IDs should be ignored. - result[1]->vendor_id = 1234; - result[1]->product_id = 5678; - result[2] = device::serial::DeviceInfo::New(); - result[2]->display_name = ""; - return result.Pass(); - } -}; - -} // namespace - -void CreateSerialService( - mojo::InterfaceRequest<device::serial::SerialService> request) { - mojo::BindToRequest( - new device::SerialServiceImpl( - new device::SerialConnectionFactory( - device::SerialConnectionFactory::IoHandlerFactory(), - base::MessageLoopProxy::current()), - scoped_ptr<device::SerialDeviceEnumerator>( - new FakeSerialDeviceEnumerator)), - &request); -} - -class SerialApiTest : public ApiTestBase { - public: - virtual void SetUp() OVERRIDE { - ApiTestBase::SetUp(); - env()->RegisterModule("serial", IDR_SERIAL_CUSTOM_BINDINGS_JS); - env()->RegisterModule("serial_service", IDR_SERIAL_SERVICE_JS); - env()->RegisterModule("device/serial/serial.mojom", IDR_SERIAL_MOJOM_JS); - service_provider()->AddService<device::serial::SerialService>( - base::Bind(CreateSerialService)); - } -}; - -TEST_F(SerialApiTest, GetDevices) { - RunTest("serial_unittest.js", "testGetDevices"); -} - -} // namespace extensions |