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

Side by Side Diff: components/component_updater/default_component_installer_unittest.cc

Issue 2483513002: Revert of Makes the component installers return a Result instead of a bool. (Closed)
Patch Set: Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <iterator> 5 #include <iterator>
6 #include <string> 6 #include <string>
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const base::FilePath& dir) const override { 75 const base::FilePath& dir) const override {
76 return true; 76 return true;
77 } 77 }
78 78
79 bool SupportsGroupPolicyEnabledComponentUpdates() const override { 79 bool SupportsGroupPolicyEnabledComponentUpdates() const override {
80 return true; 80 return true;
81 } 81 }
82 82
83 bool RequiresNetworkEncryption() const override { return true; } 83 bool RequiresNetworkEncryption() const override { return true; }
84 84
85 update_client::CrxInstaller::Result OnCustomInstall( 85 bool OnCustomInstall(const base::DictionaryValue& manifest,
86 const base::DictionaryValue& manifest, 86 const base::FilePath& install_dir) override {
87 const base::FilePath& install_dir) override { 87 return true;
88 return update_client::CrxInstaller::Result(0);
89 } 88 }
90 89
91 void ComponentReady( 90 void ComponentReady(
92 const base::Version& version, 91 const base::Version& version,
93 const base::FilePath& install_dir, 92 const base::FilePath& install_dir,
94 std::unique_ptr<base::DictionaryValue> manifest) override {} 93 std::unique_ptr<base::DictionaryValue> manifest) override {}
95 94
96 base::FilePath GetRelativeInstallDir() const override { 95 base::FilePath GetRelativeInstallDir() const override {
97 return base::FilePath(FILE_PATH_LITERAL("fake")); 96 return base::FilePath(FILE_PATH_LITERAL("fake"));
98 } 97 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 component.pk_hash); 227 component.pk_hash);
229 EXPECT_EQ(base::Version("0.0.0.0"), component.version); 228 EXPECT_EQ(base::Version("0.0.0.0"), component.version);
230 EXPECT_TRUE(component.fingerprint.empty()); 229 EXPECT_TRUE(component.fingerprint.empty());
231 EXPECT_STREQ("fake name", component.name.c_str()); 230 EXPECT_STREQ("fake name", component.name.c_str());
232 EXPECT_EQ(expected_attrs, component.installer_attributes); 231 EXPECT_EQ(expected_attrs, component.installer_attributes);
233 EXPECT_TRUE(component.requires_network_encryption); 232 EXPECT_TRUE(component.requires_network_encryption);
234 EXPECT_TRUE(component.supports_group_policy_enable_component_updates); 233 EXPECT_TRUE(component.supports_group_policy_enable_component_updates);
235 } 234 }
236 235
237 } // namespace component_updater 236 } // namespace component_updater
OLDNEW
« no previous file with comments | « components/component_updater/default_component_installer.cc ('k') | components/update_client/action_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698