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 4f5225b300e2a1d85a4164bcde8dd4391586c39b..f388d21c06f7c5bcac4f7365fa7f4f2138d794e5 100644 |
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc |
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc |
@@ -63,7 +63,7 @@ const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20, |
#if !defined(OS_LINUX) && defined(GOOGLE_CHROME_BUILD) |
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()) |
@@ -102,7 +102,7 @@ bool MakePepperFlashPluginInfo(const base::FilePath& flash_path, |
// or component updated). |
// |version| is the version of that Flash implementation. |
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)) |
@@ -127,7 +127,7 @@ void RegisterPepperFlashWithChrome(const base::FilePath& path, |
break; |
} |
- Version registered_version(base::UTF16ToUTF8(plugin.version)); |
+ base::Version registered_version(base::UTF16ToUTF8(plugin.version)); |
// If lower version, never register. |
if (registered_version.IsValid() && |
@@ -242,7 +242,7 @@ void FlashComponentInstallerTraits::ComponentReady( |
bool FlashComponentInstallerTraits::VerifyInstallation( |
const base::DictionaryValue& manifest, |
const base::FilePath& install_dir) const { |
- Version unused; |
+ base::Version unused; |
return chrome::CheckPepperFlashManifest(manifest, &unused); |
} |