diff options
author | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 01:17:02 +0000 |
---|---|---|
committer | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 01:17:02 +0000 |
commit | c605637e7b6470aa8c6504c67345f6668d3a769d (patch) | |
tree | 23e82538b751e3ad9adb307d99acda3357bd97e5 /chrome/common/extensions/extension_unittest.cc | |
parent | 82a6817ca1b748061a8cb7a5d9d46c01c3c553a0 (diff) | |
download | chromium_src-c605637e7b6470aa8c6504c67345f6668d3a769d.zip chromium_src-c605637e7b6470aa8c6504c67345f6668d3a769d.tar.gz chromium_src-c605637e7b6470aa8c6504c67345f6668d3a769d.tar.bz2 |
Refactor api permissions to eliminate the need for fileSystem and mediaGalleries specific classes.
This changes the permission parsing code in Extension to support parsing
permissions like [{'fileSystem': ['write']}] as equivalent to
['fileSystem', 'fileSystem.write'].
BUG=147531
BUG=156125
Review URL: https://chromiumcodereview.appspot.com/11005002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_unittest.cc')
-rw-r--r-- | chrome/common/extensions/extension_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 6a43079..dea6eb3 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -473,7 +473,7 @@ TEST(ExtensionTest, SocketPermissions) { &error); EXPECT_TRUE(extension == NULL); ASSERT_EQ(ExtensionErrorUtils::FormatErrorMessage( - errors::kInvalidPermission, base::IntToString(0)), error); + errors::kInvalidPermission, "socket"), error); extension = LoadManifest("socket_permissions", "socket2.json"); EXPECT_TRUE(CheckSocketPermission( @@ -901,7 +901,7 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, Permissions) { &error); EXPECT_TRUE(extension == NULL); EXPECT_EQ(ExtensionErrorUtils::FormatErrorMessage( - errors::kInvalidPermissionScheme, base::IntToString(1)), error); + errors::kInvalidPermissionScheme, "chrome://*/"), error); // Having chrome://favicon/* should not give you chrome://* extension = LoadManifestStrict("script_and_capture", |