Skip to content

Commit 08f92b3

Browse files
sorinjCommit Bot
sorinj
authored and
Commit Bot
committedSep 25, 2017
Rename DefaultComponentInstaller to ComponentInstaller.
R: [email protected] Bug: 767550 Change-Id: Ifac822a561e4769da625530e0e06a22c7ce74ba5 Reviewed-on: https://chromium-review.googlesource.com/677472 Reviewed-by: Joshua Pawlicki <[email protected]> Reviewed-by: Chris Hamilton <[email protected]> Commit-Queue: Sorin Jianu <[email protected]> Cr-Commit-Position: refs/heads/master@{#504076}
·
74.0.3698.063.0.3224.0
1 parent e4ff3e7 commit 08f92b3

34 files changed

+496
-514
lines changed
 

‎chrome/browser/component_updater/cros_component_installer.cc

+15-16
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ComponentConfig::ComponentConfig(const std::string& name,
7272
: name(name), env_version(env_version), sha2hashstr(sha2hashstr) {}
7373
ComponentConfig::~ComponentConfig() {}
7474

75-
CrOSComponentInstallerTraits::CrOSComponentInstallerTraits(
75+
CrOSComponentInstallerPolicy::CrOSComponentInstallerPolicy(
7676
const ComponentConfig& config)
7777
: name(config.name), env_version(config.env_version) {
7878
if (config.sha2hashstr.length() != 64)
@@ -84,17 +84,17 @@ CrOSComponentInstallerTraits::CrOSComponentInstallerTraits(
8484
}
8585
}
8686

87-
bool CrOSComponentInstallerTraits::SupportsGroupPolicyEnabledComponentUpdates()
87+
bool CrOSComponentInstallerPolicy::SupportsGroupPolicyEnabledComponentUpdates()
8888
const {
8989
return true;
9090
}
9191

92-
bool CrOSComponentInstallerTraits::RequiresNetworkEncryption() const {
92+
bool CrOSComponentInstallerPolicy::RequiresNetworkEncryption() const {
9393
return true;
9494
}
9595

9696
update_client::CrxInstaller::Result
97-
CrOSComponentInstallerTraits::OnCustomInstall(
97+
CrOSComponentInstallerPolicy::OnCustomInstall(
9898
const base::DictionaryValue& manifest,
9999
const base::FilePath& install_dir) {
100100
std::string version;
@@ -107,7 +107,7 @@ CrOSComponentInstallerTraits::OnCustomInstall(
107107
return update_client::CrxInstaller::Result(update_client::InstallError::NONE);
108108
}
109109

110-
void CrOSComponentInstallerTraits::ComponentReady(
110+
void CrOSComponentInstallerPolicy::ComponentReady(
111111
const base::Version& version,
112112
const base::FilePath& path,
113113
std::unique_ptr<base::DictionaryValue> manifest) {
@@ -119,37 +119,37 @@ void CrOSComponentInstallerTraits::ComponentReady(
119119
}
120120
}
121121

122-
bool CrOSComponentInstallerTraits::VerifyInstallation(
122+
bool CrOSComponentInstallerPolicy::VerifyInstallation(
123123
const base::DictionaryValue& manifest,
124124
const base::FilePath& install_dir) const {
125125
return true;
126126
}
127127

128-
base::FilePath CrOSComponentInstallerTraits::GetRelativeInstallDir() const {
128+
base::FilePath CrOSComponentInstallerPolicy::GetRelativeInstallDir() const {
129129
return base::FilePath(name);
130130
}
131131

132-
void CrOSComponentInstallerTraits::GetHash(std::vector<uint8_t>* hash) const {
132+
void CrOSComponentInstallerPolicy::GetHash(std::vector<uint8_t>* hash) const {
133133
hash->assign(kSha2Hash_, kSha2Hash_ + arraysize(kSha2Hash_));
134134
}
135135

136-
std::string CrOSComponentInstallerTraits::GetName() const {
136+
std::string CrOSComponentInstallerPolicy::GetName() const {
137137
return name;
138138
}
139139

140140
update_client::InstallerAttributes
141-
CrOSComponentInstallerTraits::GetInstallerAttributes() const {
141+
CrOSComponentInstallerPolicy::GetInstallerAttributes() const {
142142
update_client::InstallerAttributes attrs;
143143
attrs["_env_version"] = env_version;
144144
return attrs;
145145
}
146146

147-
std::vector<std::string> CrOSComponentInstallerTraits::GetMimeTypes() const {
147+
std::vector<std::string> CrOSComponentInstallerPolicy::GetMimeTypes() const {
148148
std::vector<std::string> mime_types;
149149
return mime_types;
150150
}
151151

152-
bool CrOSComponentInstallerTraits::IsCompatible(
152+
bool CrOSComponentInstallerPolicy::IsCompatible(
153153
const std::string& env_version_str,
154154
const std::string& min_env_version_str) {
155155
base::Version env_version(env_version_str);
@@ -205,12 +205,11 @@ static void RegisterComponent(ComponentUpdateService* cus,
205205
const ComponentConfig& config,
206206
const base::Closure& register_callback) {
207207
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
208-
std::unique_ptr<ComponentInstallerTraits> traits(
209-
new CrOSComponentInstallerTraits(config));
208+
std::unique_ptr<ComponentInstallerPolicy> policy(
209+
new CrOSComponentInstallerPolicy(config));
210210
// |cus| will take ownership of |installer| during
211211
// installer->Register(cus).
212-
DefaultComponentInstaller* installer =
213-
new DefaultComponentInstaller(std::move(traits));
212+
ComponentInstaller* installer = new ComponentInstaller(std::move(policy));
214213
installer->Register(cus, register_callback);
215214
}
216215

‎chrome/browser/component_updater/cros_component_installer.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <vector>
1212

1313
#include "chromeos/dbus/dbus_method_call_status.h"
14+
#include "components/component_updater/component_installer.h"
1415
#include "components/component_updater/component_updater_service.h"
15-
#include "components/component_updater/default_component_installer.h"
1616
#include "components/update_client/update_client.h"
1717
#include "crypto/sha2.h"
1818

@@ -42,18 +42,18 @@ struct ComponentConfig {
4242
~ComponentConfig();
4343
};
4444

45-
class CrOSComponentInstallerTraits : public ComponentInstallerTraits {
45+
class CrOSComponentInstallerPolicy : public ComponentInstallerPolicy {
4646
public:
47-
explicit CrOSComponentInstallerTraits(const ComponentConfig& config);
48-
~CrOSComponentInstallerTraits() override {}
47+
explicit CrOSComponentInstallerPolicy(const ComponentConfig& config);
48+
~CrOSComponentInstallerPolicy() override {}
4949

5050
private:
5151
FRIEND_TEST_ALL_PREFIXES(CrOSComponentInstallerTest, IsCompatibleOrNot);
5252
FRIEND_TEST_ALL_PREFIXES(CrOSComponentInstallerTest,
5353
ComponentReadyCorrectManifest);
5454
FRIEND_TEST_ALL_PREFIXES(CrOSComponentInstallerTest,
5555
ComponentReadyWrongManifest);
56-
// The following methods override ComponentInstallerTraits.
56+
// The following methods override ComponentInstallerPolicy.
5757
bool SupportsGroupPolicyEnabledComponentUpdates() const override;
5858
bool RequiresNetworkEncryption() const override;
5959
update_client::CrxInstaller::Result OnCustomInstall(
@@ -76,7 +76,7 @@ class CrOSComponentInstallerTraits : public ComponentInstallerTraits {
7676
std::string env_version;
7777
uint8_t kSha2Hash_[crypto::kSHA256Length] = {};
7878

79-
DISALLOW_COPY_AND_ASSIGN(CrOSComponentInstallerTraits);
79+
DISALLOW_COPY_AND_ASSIGN(CrOSComponentInstallerPolicy);
8080
};
8181

8282
// This class contains functions used to register and install a component.

‎chrome/browser/component_updater/cros_component_installer_unittest.cc

+17-17
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class CrOSComponentInstallerTest : public PlatformTest {
4545
DISALLOW_COPY_AND_ASSIGN(CrOSComponentInstallerTest);
4646
};
4747

48-
class MockCrOSComponentInstallerTraits : public CrOSComponentInstallerTraits {
48+
class MockCrOSComponentInstallerPolicy : public CrOSComponentInstallerPolicy {
4949
public:
50-
explicit MockCrOSComponentInstallerTraits(const ComponentConfig& config)
51-
: CrOSComponentInstallerTraits(config) {}
50+
explicit MockCrOSComponentInstallerPolicy(const ComponentConfig& config)
51+
: CrOSComponentInstallerPolicy(config) {}
5252
MOCK_METHOD2(IsCompatible,
5353
bool(const std::string& env_version_str,
5454
const std::string& min_env_version_str));
@@ -65,39 +65,39 @@ TEST_F(CrOSComponentInstallerTest, BPPPCompatibleCrOSComponent) {
6565

6666
TEST_F(CrOSComponentInstallerTest, ComponentReadyCorrectManifest) {
6767
ComponentConfig config("a", "2.1", "");
68-
MockCrOSComponentInstallerTraits traits(config);
69-
EXPECT_CALL(traits, IsCompatible(testing::_, testing::_)).Times(1);
68+
MockCrOSComponentInstallerPolicy policy(config);
69+
EXPECT_CALL(policy, IsCompatible(testing::_, testing::_)).Times(1);
7070
base::Version version;
7171
base::FilePath path;
7272
std::unique_ptr<base::DictionaryValue> manifest =
7373
base::MakeUnique<base::DictionaryValue>();
7474
manifest->SetString("min_env_version", "2.1");
75-
traits.ComponentReady(version, path, std::move(manifest));
75+
policy.ComponentReady(version, path, std::move(manifest));
7676
RunUntilIdle();
7777
}
7878

7979
TEST_F(CrOSComponentInstallerTest, ComponentReadyWrongManifest) {
8080
ComponentConfig config("a", "2.1", "");
81-
MockCrOSComponentInstallerTraits traits(config);
82-
EXPECT_CALL(traits, IsCompatible(testing::_, testing::_)).Times(0);
81+
MockCrOSComponentInstallerPolicy policy(config);
82+
EXPECT_CALL(policy, IsCompatible(testing::_, testing::_)).Times(0);
8383
base::Version version;
8484
base::FilePath path;
8585
std::unique_ptr<base::DictionaryValue> manifest =
8686
base::MakeUnique<base::DictionaryValue>();
87-
traits.ComponentReady(version, path, std::move(manifest));
87+
policy.ComponentReady(version, path, std::move(manifest));
8888
RunUntilIdle();
8989
}
9090

9191
TEST_F(CrOSComponentInstallerTest, IsCompatibleOrNot) {
9292
ComponentConfig config("", "", "");
93-
CrOSComponentInstallerTraits traits(config);
94-
EXPECT_TRUE(traits.IsCompatible("1.0", "1.0"));
95-
EXPECT_TRUE(traits.IsCompatible("1.1", "1.0"));
96-
EXPECT_FALSE(traits.IsCompatible("1.0", "1.1"));
97-
EXPECT_FALSE(traits.IsCompatible("1.0", "2.0"));
98-
EXPECT_FALSE(traits.IsCompatible("1.c", "1.c"));
99-
EXPECT_FALSE(traits.IsCompatible("1", "1.1"));
100-
EXPECT_TRUE(traits.IsCompatible("1.1.1", "1.1"));
93+
CrOSComponentInstallerPolicy policy(config);
94+
EXPECT_TRUE(policy.IsCompatible("1.0", "1.0"));
95+
EXPECT_TRUE(policy.IsCompatible("1.1", "1.0"));
96+
EXPECT_FALSE(policy.IsCompatible("1.0", "1.1"));
97+
EXPECT_FALSE(policy.IsCompatible("1.0", "2.0"));
98+
EXPECT_FALSE(policy.IsCompatible("1.c", "1.c"));
99+
EXPECT_FALSE(policy.IsCompatible("1", "1.1"));
100+
EXPECT_TRUE(policy.IsCompatible("1.1.1", "1.1"));
101101
}
102102

103103
} // namespace component_updater

‎chrome/browser/component_updater/file_type_policies_component_installer.cc

+14-15
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,29 @@ void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
5656

5757
namespace component_updater {
5858

59-
bool FileTypePoliciesComponentInstallerTraits::
59+
bool FileTypePoliciesComponentInstallerPolicy::
6060
SupportsGroupPolicyEnabledComponentUpdates() const {
6161
return false;
6262
}
6363

64-
bool FileTypePoliciesComponentInstallerTraits::RequiresNetworkEncryption()
64+
bool FileTypePoliciesComponentInstallerPolicy::RequiresNetworkEncryption()
6565
const {
6666
return false;
6767
}
6868

6969
update_client::CrxInstaller::Result
70-
FileTypePoliciesComponentInstallerTraits::OnCustomInstall(
70+
FileTypePoliciesComponentInstallerPolicy::OnCustomInstall(
7171
const base::DictionaryValue& manifest,
7272
const base::FilePath& install_dir) {
7373
return update_client::CrxInstaller::Result(0); // Nothing custom here.
7474
}
7575

76-
base::FilePath FileTypePoliciesComponentInstallerTraits::GetInstalledPath(
76+
base::FilePath FileTypePoliciesComponentInstallerPolicy::GetInstalledPath(
7777
const base::FilePath& base) {
7878
return base.Append(kFileTypePoliciesBinaryPbFileName);
7979
}
8080

81-
void FileTypePoliciesComponentInstallerTraits::ComponentReady(
81+
void FileTypePoliciesComponentInstallerPolicy::ComponentReady(
8282
const base::Version& version,
8383
const base::FilePath& install_dir,
8484
std::unique_ptr<base::DictionaryValue> manifest) {
@@ -91,48 +91,47 @@ void FileTypePoliciesComponentInstallerTraits::ComponentReady(
9191
}
9292

9393
// Called during startup and installation before ComponentReady().
94-
bool FileTypePoliciesComponentInstallerTraits::VerifyInstallation(
94+
bool FileTypePoliciesComponentInstallerPolicy::VerifyInstallation(
9595
const base::DictionaryValue& manifest,
9696
const base::FilePath& install_dir) const {
9797
// No need to actually validate the proto here, since we'll do the checking
9898
// in PopulateFromDynamicUpdate().
9999
return base::PathExists(GetInstalledPath(install_dir));
100100
}
101101

102-
base::FilePath FileTypePoliciesComponentInstallerTraits::GetRelativeInstallDir()
102+
base::FilePath FileTypePoliciesComponentInstallerPolicy::GetRelativeInstallDir()
103103
const {
104104
return base::FilePath(FILE_PATH_LITERAL("FileTypePolicies"));
105105
}
106106

107-
void FileTypePoliciesComponentInstallerTraits::GetHash(
107+
void FileTypePoliciesComponentInstallerPolicy::GetHash(
108108
std::vector<uint8_t>* hash) const {
109109
hash->assign(kPublicKeySHA256,
110110
kPublicKeySHA256 + arraysize(kPublicKeySHA256));
111111
}
112112

113-
std::string FileTypePoliciesComponentInstallerTraits::GetName() const {
113+
std::string FileTypePoliciesComponentInstallerPolicy::GetName() const {
114114
return kFileTypePoliciesManifestName;
115115
}
116116

117117
update_client::InstallerAttributes
118-
FileTypePoliciesComponentInstallerTraits::GetInstallerAttributes() const {
118+
FileTypePoliciesComponentInstallerPolicy::GetInstallerAttributes() const {
119119
return update_client::InstallerAttributes();
120120
}
121121

122122
std::vector<std::string>
123-
FileTypePoliciesComponentInstallerTraits::GetMimeTypes() const {
123+
FileTypePoliciesComponentInstallerPolicy::GetMimeTypes() const {
124124
return std::vector<std::string>();
125125
}
126126

127127
void RegisterFileTypePoliciesComponent(ComponentUpdateService* cus,
128128
const base::FilePath& user_data_dir) {
129129
VLOG(1) << "Registering File Type Policies component.";
130130

131-
std::unique_ptr<ComponentInstallerTraits> traits(
132-
new FileTypePoliciesComponentInstallerTraits());
131+
std::unique_ptr<ComponentInstallerPolicy> policy(
132+
new FileTypePoliciesComponentInstallerPolicy());
133133
// |cus| will take ownership of |installer| during installer->Register(cus).
134-
DefaultComponentInstaller* installer =
135-
new DefaultComponentInstaller(std::move(traits));
134+
ComponentInstaller* installer = new ComponentInstaller(std::move(policy));
136135
installer->Register(cus, base::Closure());
137136
}
138137

‎chrome/browser/component_updater/file_type_policies_component_installer.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "base/files/file_path.h"
1515
#include "base/macros.h"
1616
#include "base/values.h"
17-
#include "components/component_updater/default_component_installer.h"
17+
#include "components/component_updater/component_installer.h"
1818

1919
namespace base {
2020
class FilePath;
@@ -24,14 +24,14 @@ namespace component_updater {
2424

2525
class ComponentUpdateService;
2626

27-
class FileTypePoliciesComponentInstallerTraits
28-
: public ComponentInstallerTraits {
27+
class FileTypePoliciesComponentInstallerPolicy
28+
: public ComponentInstallerPolicy {
2929
public:
30-
FileTypePoliciesComponentInstallerTraits() {}
31-
~FileTypePoliciesComponentInstallerTraits() override {}
30+
FileTypePoliciesComponentInstallerPolicy() {}
31+
~FileTypePoliciesComponentInstallerPolicy() override {}
3232

3333
private:
34-
// The following methods override ComponentInstallerTraits.
34+
// The following methods override ComponentInstallerPolicy.
3535
bool SupportsGroupPolicyEnabledComponentUpdates() const override;
3636
bool RequiresNetworkEncryption() const override;
3737
update_client::CrxInstaller::Result OnCustomInstall(
@@ -50,7 +50,7 @@ class FileTypePoliciesComponentInstallerTraits
5050

5151
static base::FilePath GetInstalledPath(const base::FilePath& base);
5252

53-
DISALLOW_COPY_AND_ASSIGN(FileTypePoliciesComponentInstallerTraits);
53+
DISALLOW_COPY_AND_ASSIGN(FileTypePoliciesComponentInstallerPolicy);
5454
};
5555

5656
// Call once during startup to make the component update service aware of

0 commit comments

Comments
 (0)
Please sign in to comment.