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 db620feac446242be657e27ae5559c201f01d142..3d04f29ceb988ebc98f0b2ca9abe6eb94923918a 100644 |
--- a/chrome/browser/component_updater/recovery_component_installer.cc |
+++ b/chrome/browser/component_updater/recovery_component_installer.cc |
@@ -46,7 +46,7 @@ const char kRecoveryManifestName[] = "ChromeRecovery"; |
class RecoveryComponentInstaller : public ComponentInstaller { |
public: |
- explicit RecoveryComponentInstaller(const Version& version, |
+ explicit RecoveryComponentInstaller(const base::Version& version, |
PrefService* prefs); |
virtual ~RecoveryComponentInstaller() {} |
@@ -60,14 +60,14 @@ class RecoveryComponentInstaller : public ComponentInstaller { |
base::FilePath* installed_file) OVERRIDE; |
private: |
- Version current_version_; |
+ base::Version current_version_; |
PrefService* prefs_; |
}; |
void RecoveryRegisterHelper(ComponentUpdateService* cus, |
PrefService* prefs) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- Version version(prefs->GetString(prefs::kRecoveryComponentVersion)); |
+ base::Version version(prefs->GetString(prefs::kRecoveryComponentVersion)); |
if (!version.IsValid()) { |
NOTREACHED(); |
return; |
@@ -83,13 +83,14 @@ void RecoveryRegisterHelper(ComponentUpdateService* cus, |
} |
} |
-void RecoveryUpdateVersionHelper(const Version& version, PrefService* prefs) { |
+void RecoveryUpdateVersionHelper(const base::Version& version, |
+ PrefService* prefs) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
prefs->SetString(prefs::kRecoveryComponentVersion, version.GetString()); |
} |
RecoveryComponentInstaller::RecoveryComponentInstaller( |
- const Version& version, PrefService* prefs) |
+ const base::Version& version, PrefService* prefs) |
: current_version_(version), prefs_(prefs){ |
DCHECK(version.IsValid()); |
} |
@@ -106,7 +107,7 @@ bool RecoveryComponentInstaller::Install(const base::DictionaryValue& manifest, |
return false; |
std::string proposed_version; |
manifest.GetStringASCII("version", &proposed_version); |
- Version version(proposed_version.c_str()); |
+ base::Version version(proposed_version.c_str()); |
if (!version.IsValid()) |
return false; |
if (current_version_.CompareTo(version) >= 0) |