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

Side by Side Diff: extensions/browser/api/usb/usb_apitest.cc

Issue 2417043002: Move device/core files to device/base directory. (Closed)
Patch Set: Fix ChromeOS build Created 4 years, 2 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
« no previous file with comments | « extensions/browser/api/usb/usb_api.cc ('k') | extensions/browser/api/usb/usb_event_router.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <numeric> 7 #include <numeric>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/test/test_utils.h" 11 #include "content/public/test/test_utils.h"
12 #include "device/core/mock_device_client.h" 12 #include "device/base/mock_device_client.h"
13 #include "device/usb/mock_usb_device.h" 13 #include "device/usb/mock_usb_device.h"
14 #include "device/usb/mock_usb_device_handle.h" 14 #include "device/usb/mock_usb_device_handle.h"
15 #include "device/usb/mock_usb_service.h" 15 #include "device/usb/mock_usb_service.h"
16 #include "extensions/browser/api/device_permissions_prompt.h" 16 #include "extensions/browser/api/device_permissions_prompt.h"
17 #include "extensions/browser/api/usb/usb_api.h" 17 #include "extensions/browser/api/usb/usb_api.h"
18 #include "extensions/shell/browser/shell_extensions_api_client.h" 18 #include "extensions/shell/browser/shell_extensions_api_client.h"
19 #include "extensions/shell/test/shell_apitest.h" 19 #include "extensions/shell/test/shell_apitest.h"
20 #include "extensions/test/extension_test_message_listener.h" 20 #include "extensions/test/extension_test_message_listener.h"
21 #include "net/base/io_buffer.h" 21 #include "net/base/io_buffer.h"
22 22
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 TestExtensionsAPIClient test_api_client; 273 TestExtensionsAPIClient test_api_client;
274 ASSERT_TRUE(LoadApp("api_test/usb/get_user_selected_devices")); 274 ASSERT_TRUE(LoadApp("api_test/usb/get_user_selected_devices"));
275 ASSERT_TRUE(ready_listener.WaitUntilSatisfied()); 275 ASSERT_TRUE(ready_listener.WaitUntilSatisfied());
276 276
277 device_client_->usb_service()->RemoveDevice(mock_device_); 277 device_client_->usb_service()->RemoveDevice(mock_device_);
278 ASSERT_TRUE(result_listener.WaitUntilSatisfied()); 278 ASSERT_TRUE(result_listener.WaitUntilSatisfied());
279 } 279 }
280 280
281 } // namespace extensions 281 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/usb/usb_api.cc ('k') | extensions/browser/api/usb/usb_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698