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 <memory> | 5 #include <memory> |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/json/json_file_value_serializer.h" | 9 #include "base/json/json_file_value_serializer.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 return; | 82 return; |
83 } | 83 } |
84 | 84 |
85 JSONFileValueDeserializer deserializer(manifest); | 85 JSONFileValueDeserializer deserializer(manifest); |
86 std::string error; | 86 std::string error; |
87 | 87 |
88 std::unique_ptr<base::DictionaryValue> root = | 88 std::unique_ptr<base::DictionaryValue> root = |
89 base::DictionaryValue::From(deserializer.Deserialize(NULL, &error)); | 89 base::DictionaryValue::From(deserializer.Deserialize(NULL, &error)); |
90 | 90 |
91 ASSERT_TRUE(root); | 91 ASSERT_TRUE(root); |
92 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); | 92 ASSERT_TRUE(root->IsType(base::Value::Type::DICTIONARY)); |
93 | 93 |
94 // This checks that the whole manifest is compatible. | 94 // This checks that the whole manifest is compatible. |
95 base::Version version; | 95 base::Version version; |
96 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version)); | 96 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version)); |
97 EXPECT_TRUE(version.IsValid()); | 97 EXPECT_TRUE(version.IsValid()); |
98 } | 98 } |
99 | 99 |
100 } // namespace component_updater | 100 } // namespace component_updater |
OLD | NEW |