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

Side by Side Diff: chrome/browser/extensions/api/device_permissions_manager_unittest.cc

Issue 882813002: Observe UsbService from the FILE thread in DevicePermissionsManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the controversial fix for bug 452298. Created 5 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
« no previous file with comments | « no previous file | extensions/browser/api/device_permissions_manager.h » ('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 "base/run_loop.h" 5 #include "base/run_loop.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/test/values_test_util.h" 7 #include "base/test/values_test_util.h"
8 #include "chrome/browser/extensions/test_extension_environment.h" 8 #include "chrome/browser/extensions/test_extension_environment.h"
9 #include "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "device/core/device_client.h" 10 #include "device/core/device_client.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // ExtensionPrefs, it is "persistent". 216 // ExtensionPrefs, it is "persistent".
217 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get()); 217 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get());
218 // Device 1 does not have uniquely identifying traits and so permission to 218 // Device 1 does not have uniquely identifying traits and so permission to
219 // open it has been dropped when the app's windows have closed and the 219 // open it has been dropped when the app's windows have closed and the
220 // background page has been suspended. 220 // background page has been suspended.
221 ASSERT_FALSE(FindEntry(device_permissions.get(), device1_).get()); 221 ASSERT_FALSE(FindEntry(device_permissions.get(), device1_).get());
222 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get()); 222 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get());
223 ASSERT_FALSE(FindEntry(device_permissions.get(), device3_).get()); 223 ASSERT_FALSE(FindEntry(device_permissions.get(), device3_).get());
224 } 224 }
225 225
226 TEST_F(DevicePermissionsManagerTest, DisconnectDevice) { 226 // TODO(reillyg): Until crbug.com/427985 is resolved device removal
227 // notifications are delivered asynchronously and so this test must be disabled.
228 TEST_F(DevicePermissionsManagerTest, DISABLED_DisconnectDevice) {
227 DevicePermissionsManager* manager = 229 DevicePermissionsManager* manager =
228 DevicePermissionsManager::Get(env_.profile()); 230 DevicePermissionsManager::Get(env_.profile());
229 AllowUsbDevice(manager, extension_, device0_); 231 AllowUsbDevice(manager, extension_, device0_);
230 AllowUsbDevice(manager, extension_, device1_); 232 AllowUsbDevice(manager, extension_, device1_);
231 233
232 scoped_ptr<DevicePermissions> device_permissions = 234 scoped_ptr<DevicePermissions> device_permissions =
233 manager->GetForExtension(extension_->id()); 235 manager->GetForExtension(extension_->id());
234 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get()); 236 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get());
235 ASSERT_TRUE(FindEntry(device_permissions.get(), device1_).get()); 237 ASSERT_TRUE(FindEntry(device_permissions.get(), device1_).get());
236 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get()); 238 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get());
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 DevicePermissionsManager::Get(env_.profile()); 323 DevicePermissionsManager::Get(env_.profile());
322 scoped_ptr<DevicePermissions> device_permissions = 324 scoped_ptr<DevicePermissions> device_permissions =
323 manager->GetForExtension(extension_->id()); 325 manager->GetForExtension(extension_->id());
324 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get()); 326 ASSERT_TRUE(FindEntry(device_permissions.get(), device0_).get());
325 ASSERT_FALSE(FindEntry(device_permissions.get(), device1_).get()); 327 ASSERT_FALSE(FindEntry(device_permissions.get(), device1_).get());
326 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get()); 328 ASSERT_FALSE(FindEntry(device_permissions.get(), device2_).get());
327 ASSERT_FALSE(FindEntry(device_permissions.get(), device3_).get()); 329 ASSERT_FALSE(FindEntry(device_permissions.get(), device3_).get());
328 } 330 }
329 331
330 } // namespace extensions 332 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | extensions/browser/api/device_permissions_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698