Index: chrome/common/extensions/permissions/media_galleries_permission_unittest.cc |
=================================================================== |
--- chrome/common/extensions/permissions/media_galleries_permission_unittest.cc (revision 181366) |
+++ chrome/common/extensions/permissions/media_galleries_permission_unittest.cc (working copy) |
@@ -33,11 +33,6 @@ |
value->AppendString(MediaGalleriesPermission::kReadPermission); |
EXPECT_TRUE(permission->FromValue(value.get())); |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_TRUE(permission->FromValue(value.get())); |
- |
// all_detected |
value.reset(new base::ListValue()); |
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
@@ -48,26 +43,11 @@ |
value->AppendString(MediaGalleriesPermission::kReadPermission); |
EXPECT_TRUE(permission->FromValue(value.get())); |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_TRUE(permission->FromValue(value.get())); |
- |
// Repeats are ok. |
value.reset(new base::ListValue()); |
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
EXPECT_TRUE(permission->FromValue(value.get())); |
- |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_TRUE(permission->FromValue(value.get())); |
- |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
- value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_TRUE(permission->FromValue(value.get())); |
} |
TEST(MediaGalleriesPermissionTest, BadValues) { |
@@ -80,18 +60,6 @@ |
// Empty |
scoped_ptr<base::ListValue> value(new base::ListValue()); |
EXPECT_FALSE(permission->FromValue(value.get())); |
- |
- // Read and write. |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kReadPermission); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_FALSE(permission->FromValue(value.get())); |
- |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); |
- value->AppendString(MediaGalleriesPermission::kReadPermission); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- EXPECT_FALSE(permission->FromValue(value.get())); |
} |
TEST(MediaGalleriesPermissionTest, Equal) { |
@@ -140,15 +108,6 @@ |
ASSERT_TRUE(vtmp); |
ASSERT_TRUE(permission2->FromValue(vtmp.get())); |
EXPECT_TRUE(permission1->Equal(permission2.get())); |
- |
- value.reset(new base::ListValue()); |
- value->AppendString(MediaGalleriesPermission::kWritePermission); |
- ASSERT_TRUE(permission1->FromValue(value.get())); |
- |
- vtmp = permission1->ToValue(); |
- ASSERT_TRUE(vtmp); |
- ASSERT_TRUE(permission2->FromValue(vtmp.get())); |
- EXPECT_TRUE(permission1->Equal(permission2.get())); |
} |
} // namespace |