| 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 "extensions/common/manifest_test.h" | 5 #include "extensions/common/manifest_test.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 // Helper class that simplifies creating methods that take either a filename | 59 // Helper class that simplifies creating methods that take either a filename |
| 60 // to a manifest or the manifest itself. | 60 // to a manifest or the manifest itself. |
| 61 ManifestTest::ManifestData::ManifestData(const char* name) | 61 ManifestTest::ManifestData::ManifestData(const char* name) |
| 62 : name_(name), manifest_(nullptr) {} | 62 : name_(name), manifest_(nullptr) {} |
| 63 | 63 |
| 64 // This does not take ownership of |manifest|. | 64 // This does not take ownership of |manifest|. |
| 65 ManifestTest::ManifestData::ManifestData(base::DictionaryValue* manifest, | 65 ManifestTest::ManifestData::ManifestData(base::DictionaryValue* manifest, |
| 66 const char* name) | 66 const char* name) |
| 67 : name_(name), manifest_(manifest) { | 67 : name_(name), manifest_(manifest) { |
| 68 CHECK(manifest_) << "Manifest NULL"; | 68 // Manifest NULL |
| 69 CHECK(manifest_); |
| 69 } | 70 } |
| 70 | 71 |
| 71 ManifestTest::ManifestData::ManifestData( | 72 ManifestTest::ManifestData::ManifestData( |
| 72 std::unique_ptr<base::DictionaryValue> manifest) | 73 std::unique_ptr<base::DictionaryValue> manifest) |
| 73 : manifest_(manifest.get()), manifest_holder_(std::move(manifest)) { | 74 : manifest_(manifest.get()), manifest_holder_(std::move(manifest)) { |
| 74 CHECK(manifest_) << "Manifest NULL"; | 75 // Manifest NULL |
| 76 CHECK(manifest_); |
| 75 } | 77 } |
| 76 | 78 |
| 77 ManifestTest::ManifestData::ManifestData( | 79 ManifestTest::ManifestData::ManifestData( |
| 78 std::unique_ptr<base::DictionaryValue> manifest, | 80 std::unique_ptr<base::DictionaryValue> manifest, |
| 79 const char* name) | 81 const char* name) |
| 80 : name_(name), | 82 : name_(name), |
| 81 manifest_(manifest.get()), | 83 manifest_(manifest.get()), |
| 82 manifest_holder_(std::move(manifest)) { | 84 manifest_holder_(std::move(manifest)) { |
| 83 CHECK(manifest_) << "Manifest NULL"; | 85 // Manifest NULL |
| 86 CHECK(manifest_); |
| 84 } | 87 } |
| 85 | 88 |
| 86 ManifestTest::ManifestData::ManifestData(const ManifestData& m) { | 89 ManifestTest::ManifestData::ManifestData(const ManifestData& m) { |
| 87 NOTREACHED(); | 90 NOTREACHED(); |
| 88 } | 91 } |
| 89 | 92 |
| 90 ManifestTest::ManifestData::~ManifestData() { | 93 ManifestTest::ManifestData::~ManifestData() { |
| 91 } | 94 } |
| 92 | 95 |
| 93 base::DictionaryValue* ManifestTest::ManifestData::GetManifest( | 96 base::DictionaryValue* ManifestTest::ManifestData::GetManifest( |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 break; | 270 break; |
| 268 case EXPECT_TYPE_SUCCESS: | 271 case EXPECT_TYPE_SUCCESS: |
| 269 LoadAndExpectSuccess(testcase.manifest_filename_.c_str(), | 272 LoadAndExpectSuccess(testcase.manifest_filename_.c_str(), |
| 270 testcase.location_, | 273 testcase.location_, |
| 271 testcase.flags_); | 274 testcase.flags_); |
| 272 break; | 275 break; |
| 273 } | 276 } |
| 274 } | 277 } |
| 275 | 278 |
| 276 } // namespace extensions | 279 } // namespace extensions |
| OLD | NEW |