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

Side by Side Diff: extensions/browser/api/serial/serial_apitest.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
OLDNEW
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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 protected: 43 protected:
44 ~FakeSerialGetDevicesFunction() override {} 44 ~FakeSerialGetDevicesFunction() override {}
45 }; 45 };
46 46
47 class FakeSerialDeviceEnumerator : public device::SerialDeviceEnumerator { 47 class FakeSerialDeviceEnumerator : public device::SerialDeviceEnumerator {
48 public: 48 public:
49 ~FakeSerialDeviceEnumerator() override {} 49 ~FakeSerialDeviceEnumerator() override {}
50 50
51 mojo::Array<device::serial::DeviceInfoPtr> GetDevices() override { 51 std::vector<device::serial::DeviceInfoPtr> GetDevices() override {
52 mojo::Array<device::serial::DeviceInfoPtr> devices; 52 std::vector<device::serial::DeviceInfoPtr> devices;
53 device::serial::DeviceInfoPtr device0(device::serial::DeviceInfo::New()); 53 device::serial::DeviceInfoPtr device0(device::serial::DeviceInfo::New());
54 device0->path = "/dev/fakeserialmojo"; 54 device0->path = "/dev/fakeserialmojo";
55 device::serial::DeviceInfoPtr device1(device::serial::DeviceInfo::New()); 55 device::serial::DeviceInfoPtr device1(device::serial::DeviceInfo::New());
56 device1->path = "\\\\COM800\\"; 56 device1->path = "\\\\COM800\\";
57 devices.push_back(std::move(device0)); 57 devices.push_back(std::move(device0));
58 devices.push_back(std::move(device1)); 58 devices.push_back(std::move(device1));
59 return devices; 59 return devices;
60 } 60 }
61 }; 61 };
62 62
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialRealHardware) { 161 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialRealHardware) {
162 ResultCatcher catcher; 162 ResultCatcher catcher;
163 catcher.RestrictToBrowserContext(browser()->profile()); 163 catcher.RestrictToBrowserContext(browser()->profile());
164 164
165 ASSERT_TRUE(RunExtensionTest("serial/real_hardware")) << message_; 165 ASSERT_TRUE(RunExtensionTest("serial/real_hardware")) << message_;
166 } 166 }
167 167
168 } // namespace extensions 168 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698