| Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| index 2ebbb31854080d51bc574bc9aebdb89ad23aa79e..6ef90183a9d330150704f322da16e14bcf4bc921 100644
|
| --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| @@ -71,7 +71,7 @@ base::FilePath GetPepperFlashBaseDirectory() {
|
| // |latest_version| returns the corresponding version number. |older_dirs|
|
| // returns directories of all older versions.
|
| bool GetPepperFlashDirectory(base::FilePath* latest_dir,
|
| - Version* latest_version,
|
| + base::Version* latest_version,
|
| std::vector<base::FilePath>* older_dirs) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::FILE);
|
| base::FilePath base_dir = GetPepperFlashBaseDirectory();
|
| @@ -80,7 +80,7 @@ bool GetPepperFlashDirectory(base::FilePath* latest_dir,
|
| 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 (found) {
|
| @@ -102,7 +102,7 @@ bool GetPepperFlashDirectory(base::FilePath* latest_dir,
|
| #endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
|
|
|
| bool MakePepperFlashPluginInfo(const base::FilePath& flash_path,
|
| - const Version& flash_version,
|
| + const base::Version& flash_version,
|
| bool out_of_process,
|
| content::PepperPluginInfo* plugin_info) {
|
| if (!flash_version.IsValid())
|
| @@ -146,7 +146,7 @@ bool IsPepperFlash(const content::WebPluginInfo& plugin) {
|
| }
|
|
|
| void RegisterPepperFlashWithChrome(const base::FilePath& path,
|
| - const Version& version) {
|
| + const base::Version& version) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| content::PepperPluginInfo plugin_info;
|
| if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
|
| @@ -162,7 +162,7 @@ void RegisterPepperFlashWithChrome(const base::FilePath& path,
|
| continue;
|
|
|
| // Do it only if the version we're trying to register is newer.
|
| - Version registered_version(base::UTF16ToUTF8(it->version));
|
| + base::Version registered_version(base::UTF16ToUTF8(it->version));
|
| if (registered_version.IsValid() &&
|
| version.CompareTo(registered_version) <= 0) {
|
| return;
|
| @@ -182,7 +182,7 @@ void RegisterPepperFlashWithChrome(const base::FilePath& path,
|
|
|
| class PepperFlashComponentInstaller : public update_client::CrxInstaller {
|
| public:
|
| - explicit PepperFlashComponentInstaller(const Version& version);
|
| + explicit PepperFlashComponentInstaller(const base::Version& version);
|
|
|
| // ComponentInstaller implementation:
|
| void OnUpdateError(int error) override;
|
| @@ -198,11 +198,11 @@ class PepperFlashComponentInstaller : public update_client::CrxInstaller {
|
| private:
|
| ~PepperFlashComponentInstaller() override {}
|
|
|
| - Version current_version_;
|
| + base::Version current_version_;
|
| };
|
|
|
| PepperFlashComponentInstaller::PepperFlashComponentInstaller(
|
| - const Version& version)
|
| + const base::Version& version)
|
| : current_version_(version) {
|
| DCHECK(version.IsValid());
|
| }
|
| @@ -214,7 +214,7 @@ void PepperFlashComponentInstaller::OnUpdateError(int error) {
|
| bool PepperFlashComponentInstaller::Install(
|
| const base::DictionaryValue& manifest,
|
| const base::FilePath& unpack_path) {
|
| - Version version;
|
| + base::Version version;
|
| if (!chrome::CheckPepperFlashManifest(manifest, &version))
|
| return false;
|
| if (current_version_.CompareTo(version) > 0)
|
| @@ -256,7 +256,7 @@ namespace {
|
|
|
| #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
|
| void FinishPepperFlashUpdateRegistration(ComponentUpdateService* cus,
|
| - const Version& version) {
|
| + const base::Version& version) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| update_client::CrxComponent pepflash;
|
| pepflash.name = "pepper_flash";
|
| @@ -277,7 +277,7 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
|
| }
|
| }
|
|
|
| - Version version(kNullVersion);
|
| + base::Version version(kNullVersion);
|
| std::vector<base::FilePath> older_dirs;
|
| if (GetPepperFlashDirectory(&path, &version, &older_dirs)) {
|
| path = path.Append(chrome::kPepperFlashPluginFilename);
|
| @@ -287,7 +287,7 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
|
| FROM_HERE,
|
| base::Bind(&RegisterPepperFlashWithChrome, path, version));
|
| } else {
|
| - version = Version(kNullVersion);
|
| + version = base::Version(kNullVersion);
|
| }
|
| }
|
|
|
| @@ -296,7 +296,7 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
|
| // than the version of the component, or the component has never been updated,
|
| // then set the bundled version as the current version.
|
| if (version.CompareTo(Version(FLAPPER_VERSION_STRING)) < 0)
|
| - version = Version(FLAPPER_VERSION_STRING);
|
| + version = base::Version(FLAPPER_VERSION_STRING);
|
| #endif
|
|
|
| BrowserThread::PostTask(
|
|
|