| 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 6b65c111613f765bb7d1c4e0b0c940bbdea842f5..f32b38b05ae354de3d3f70f6afa66f36b5f7161a 100644
|
| --- a/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| @@ -25,9 +25,9 @@ namespace keys = extension_manifest_keys;
|
| namespace values = extension_manifest_values;
|
| namespace {
|
|
|
| -static scoped_refptr<Extension> LoadManifest(const std::string& dir,
|
| - const std::string& test_file,
|
| - int extra_flags) {
|
| +scoped_refptr<Extension> LoadManifest(const std::string& dir,
|
| + const std::string& test_file,
|
| + int extra_flags) {
|
| FilePath path;
|
| PathService::Get(chrome::DIR_TEST_DATA, &path);
|
| path = path.AppendASCII("extensions")
|
| @@ -49,27 +49,18 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir,
|
| return extension;
|
| }
|
|
|
| -static scoped_refptr<Extension> LoadManifest(const std::string& dir,
|
| - const std::string& test_file) {
|
| +scoped_refptr<Extension> LoadManifest(const std::string& dir,
|
| + const std::string& test_file) {
|
| return LoadManifest(dir, test_file, Extension::NO_FLAGS);
|
| }
|
|
|
| -void CompareLists(const std::vector<std::string>& expected,
|
| - const std::vector<std::string>& actual) {
|
| - ASSERT_EQ(expected.size(), actual.size());
|
| -
|
| - for (size_t i = 0; i < expected.size(); ++i) {
|
| - EXPECT_EQ(expected[i], actual[i]);
|
| - }
|
| -}
|
| -
|
| static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
|
| int schemes = URLPattern::SCHEME_ALL;
|
| extent->AddPattern(URLPattern(schemes, pattern));
|
| }
|
|
|
| -static size_t IndexOf(const std::vector<string16>& warnings,
|
| - const std::string& warning) {
|
| +size_t IndexOf(const std::vector<string16>& warnings,
|
| + const std::string& warning) {
|
| for (size_t i = 0; i < warnings.size(); ++i) {
|
| if (warnings[i] == ASCIIToUTF16(warning))
|
| return i;
|
| @@ -78,8 +69,8 @@ static size_t IndexOf(const std::vector<string16>& warnings,
|
| return warnings.size();
|
| }
|
|
|
| -static bool Contains(const std::vector<string16>& warnings,
|
| - const std::string& warning) {
|
| +bool Contains(const std::vector<string16>& warnings,
|
| + const std::string& warning) {
|
| return IndexOf(warnings, warning) != warnings.size();
|
| }
|
|
|
|
|