| Index: chrome/browser/component_updater/recovery_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
|
| index 5341290c2e8ad25aed2c34506d3e7a6273f06785..3657d6458dc7cc6f3c6ec177e04c57e3825b0800 100644
|
| --- a/chrome/browser/component_updater/recovery_component_installer.cc
|
| +++ b/chrome/browser/component_updater/recovery_component_installer.cc
|
| @@ -92,7 +92,7 @@
|
| const base::FilePath& command,
|
| const base::DictionaryValue& manifest,
|
| bool is_deferred_run,
|
| - const base::Version& version) {
|
| + const Version& version) {
|
| base::CommandLine command_line(command);
|
|
|
| // Add a flag to for re-attempted install with elevated privilege so that the
|
| @@ -154,7 +154,7 @@
|
| return;
|
| std::string proposed_version;
|
| manifest->GetStringASCII("version", &proposed_version);
|
| - const base::Version version(proposed_version.c_str());
|
| + const Version version(proposed_version.c_str());
|
| if (!version.IsValid())
|
| return;
|
|
|
| @@ -195,7 +195,7 @@
|
| // See chrome/browser/recovery/recovery_install_global_error.cc for details.
|
| class RecoveryComponentInstaller : public update_client::CrxInstaller {
|
| public:
|
| - RecoveryComponentInstaller(const base::Version& version, PrefService* prefs);
|
| + RecoveryComponentInstaller(const Version& version, PrefService* prefs);
|
|
|
| // ComponentInstaller implementation:
|
| void OnUpdateError(int error) override;
|
| @@ -214,7 +214,7 @@
|
| bool RunInstallCommand(const base::CommandLine& cmdline,
|
| const base::FilePath& installer_folder) const;
|
|
|
| - base::Version current_version_;
|
| + Version current_version_;
|
| PrefService* prefs_;
|
| };
|
|
|
| @@ -224,7 +224,7 @@
|
|
|
| void RecoveryRegisterHelper(ComponentUpdateService* cus, PrefService* prefs) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - base::Version version(prefs->GetString(prefs::kRecoveryComponentVersion));
|
| + Version version(prefs->GetString(prefs::kRecoveryComponentVersion));
|
| if (!version.IsValid()) {
|
| NOTREACHED();
|
| return;
|
| @@ -240,8 +240,7 @@
|
| }
|
| }
|
|
|
| -void RecoveryUpdateVersionHelper(const base::Version& version,
|
| - PrefService* prefs) {
|
| +void RecoveryUpdateVersionHelper(const Version& version, PrefService* prefs) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| prefs->SetString(prefs::kRecoveryComponentVersion, version.GetString());
|
| }
|
| @@ -253,9 +252,8 @@
|
| prefs->SetBoolean(prefs::kRecoveryComponentNeedsElevation, true);
|
| }
|
|
|
| -RecoveryComponentInstaller::RecoveryComponentInstaller(
|
| - const base::Version& version,
|
| - PrefService* prefs)
|
| +RecoveryComponentInstaller::RecoveryComponentInstaller(const Version& version,
|
| + PrefService* prefs)
|
| : current_version_(version), prefs_(prefs) {
|
| DCHECK(version.IsValid());
|
| }
|
| @@ -330,7 +328,7 @@
|
| return false;
|
| std::string proposed_version;
|
| manifest.GetStringASCII("version", &proposed_version);
|
| - base::Version version(proposed_version.c_str());
|
| + Version version(proposed_version.c_str());
|
| if (!version.IsValid())
|
| return false;
|
| if (current_version_.CompareTo(version) >= 0)
|
|
|