| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/common/extensions/manifest_tests/extension_manifest_test.h" | 5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 #include "testing/gmock/include/gmock/gmock.h" | 8 #include "testing/gmock/include/gmock/gmock.h" |
| 9 | 9 |
| 10 using extensions::Extension; | 10 using extensions::Extension; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { | 39 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { |
| 40 int create_flags = Extension::NO_FLAGS; | 40 int create_flags = Extension::NO_FLAGS; |
| 41 if (test_data[i].require_modern_manifest_version) | 41 if (test_data[i].require_modern_manifest_version) |
| 42 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION; | 42 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION; |
| 43 if (test_data[i].expect_error) { | 43 if (test_data[i].expect_error) { |
| 44 LoadAndExpectError( | 44 LoadAndExpectError( |
| 45 Manifest(test_data[i].manifest, | 45 Manifest(test_data[i].manifest, |
| 46 test_data[i].test_name), | 46 test_data[i].test_name), |
| 47 errors::kInvalidManifestVersionOld, | 47 errors::kInvalidManifestVersionOld, |
| 48 Extension::LOAD, | 48 extensions::Manifest::LOAD, |
| 49 create_flags); | 49 create_flags); |
| 50 } else { | 50 } else { |
| 51 LoadAndExpectSuccess(Manifest(test_data[i].manifest, | 51 LoadAndExpectSuccess(Manifest(test_data[i].manifest, |
| 52 test_data[i].test_name), | 52 test_data[i].test_name), |
| 53 Extension::LOAD, | 53 extensions::Manifest::LOAD, |
| 54 create_flags); | 54 create_flags); |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 } | 57 } |
| OLD | NEW |