Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: chrome/browser/component_updater/component_installers_unittest.cc

Issue 2266543002: Consistently use namespaced base::Version in component_updater code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/component_updater/pnacl_component_installer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 JSONFileValueDeserializer deserializer(manifest); 75 JSONFileValueDeserializer deserializer(manifest);
76 std::string error; 76 std::string error;
77 77
78 std::unique_ptr<base::DictionaryValue> root = 78 std::unique_ptr<base::DictionaryValue> root =
79 base::DictionaryValue::From(deserializer.Deserialize(NULL, &error)); 79 base::DictionaryValue::From(deserializer.Deserialize(NULL, &error));
80 80
81 ASSERT_TRUE(root); 81 ASSERT_TRUE(root);
82 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 82 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
83 83
84 // This checks that the whole manifest is compatible. 84 // This checks that the whole manifest is compatible.
85 Version version; 85 base::Version version;
86 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version)); 86 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version));
87 EXPECT_TRUE(version.IsValid()); 87 EXPECT_TRUE(version.IsValid());
88 } 88 }
89 89
90 } // namespace component_updater 90 } // namespace component_updater
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/component_updater/pnacl_component_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698