| Index: chrome/browser/component_updater/swiftshader_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
|
| index 0dc025849b93cb6217d194407c9c984c5b3be1bb..8ca0e1f2cf0cea9e9ff876498865871449a72a7f 100644
|
| --- a/chrome/browser/component_updater/swiftshader_component_installer.cc
|
| +++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
|
| @@ -63,7 +63,7 @@ base::FilePath GetSwiftShaderBaseDirectory() {
|
| // On success it returns something like:
|
| // <profile>\AppData\Local\Google\Chrome\User Data\SwiftShader\10.3.44.555\.
|
| bool GetLatestSwiftShaderDirectory(base::FilePath* result,
|
| - Version* latest,
|
| + base::Version* latest,
|
| std::vector<base::FilePath>* older_dirs) {
|
| base::FilePath base_dir = GetSwiftShaderBaseDirectory();
|
| bool found = false;
|
| @@ -71,7 +71,7 @@ bool GetLatestSwiftShaderDirectory(base::FilePath* result,
|
| base_dir, false, base::FileEnumerator::DIRECTORIES);
|
| for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
|
| path = file_enumerator.Next()) {
|
| - Version version(path.BaseName().MaybeAsASCII());
|
| + base::Version version(path.BaseName().MaybeAsASCII());
|
| if (!version.IsValid())
|
| continue;
|
| if (version.CompareTo(*latest) > 0 &&
|
| @@ -97,7 +97,7 @@ void RegisterSwiftShaderWithChrome(const base::FilePath& path) {
|
|
|
| class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
|
| public:
|
| - explicit SwiftShaderComponentInstaller(const Version& version);
|
| + explicit SwiftShaderComponentInstaller(const base::Version& version);
|
|
|
| // ComponentInstaller implementation:
|
| void OnUpdateError(int error) override;
|
| @@ -113,11 +113,11 @@ class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
|
| private:
|
| ~SwiftShaderComponentInstaller() override {}
|
|
|
| - Version current_version_;
|
| + base::Version current_version_;
|
| };
|
|
|
| SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
|
| - const Version& version)
|
| + const base::Version& version)
|
| : current_version_(version) {
|
| DCHECK(version.IsValid());
|
| }
|
| @@ -135,7 +135,7 @@ bool SwiftShaderComponentInstaller::Install(
|
| 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)
|
| @@ -169,7 +169,7 @@ bool SwiftShaderComponentInstaller::Uninstall() {
|
| }
|
|
|
| void FinishSwiftShaderUpdateRegistration(ComponentUpdateService* cus,
|
| - const Version& version) {
|
| + const base::Version& version) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| update_client::CrxComponent swiftshader;
|
| @@ -205,7 +205,7 @@ void UpdateChecker::OnGpuInfoUpdate() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::FILE);
|
| base::FilePath path = GetSwiftShaderBaseDirectory();
|
|
|
| - Version version(kNullVersion);
|
| + base::Version version(kNullVersion);
|
| GetLatestSwiftShaderDirectory(&path, &version, NULL);
|
|
|
| BrowserThread::PostTask(
|
| @@ -229,7 +229,7 @@ void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
|
| }
|
| }
|
|
|
| - Version version(kNullVersion);
|
| + base::Version version(kNullVersion);
|
| std::vector<base::FilePath> older_dirs;
|
| if (GetLatestSwiftShaderDirectory(&path, &version, &older_dirs))
|
| BrowserThread::PostTask(BrowserThread::UI,
|
|
|