chrome/common/extensions/permissions/permission_set_unittest.cc - Issue 10852016: Move serial out of experimental.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/permissions/permission_set_unittest.cc

Issue 10852016: Move serial out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolve merge conflicts. Created 8 years, 4 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:

Index: chrome/common/extensions/permissions/permission_set_unittest.cc

diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc

index 17f7cca2dbe1f21e254a4344900fece2f1ef3fd8..39cf0a820948eceba6fa1ce507cfd90973003b2d 100644

--- a/chrome/common/extensions/permissions/permission_set_unittest.cc

+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc

@@ -608,8 +608,8 @@ TEST(PermissionsTest, PermissionMessages) {

// Platform apps. TODO(miket): must we skip?

skip.insert(APIPermission::kFileSystem);

+ skip.insert(APIPermission::kSerial);

skip.insert(APIPermission::kSocket);

- skip.insert(APIPermission::kUsb);

PermissionsInfo* info = PermissionsInfo::GetInstance();

APIPermissionSet permissions = info->GetAll();