| Index: chrome/browser/extensions/pending_extension_manager.cc
|
| diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
|
| index 9014cc92c62110ad43bc4651e9c259269186528f..ee7759b10229fd1c1c3b6b28818bcef4deae38ab 100644
|
| --- a/chrome/browser/extensions/pending_extension_manager.cc
|
| +++ b/chrome/browser/extensions/pending_extension_manager.cc
|
| @@ -25,7 +25,7 @@ bool AlwaysInstall(const extensions::Extension* extension) {
|
| return true;
|
| }
|
|
|
| -std::string GetVersionString(const Version& version) {
|
| +std::string GetVersionString(const base::Version& version) {
|
| return version.IsValid() ? version.GetString() : "invalid";
|
| }
|
|
|
| @@ -146,7 +146,7 @@ bool PendingExtensionManager::AddFromExtensionImport(
|
| return AddExtensionImpl(id,
|
| std::string(),
|
| update_url,
|
| - Version(),
|
| + base::Version(),
|
| should_allow_install,
|
| kIsFromSync,
|
| kManifestLocation,
|
| @@ -187,7 +187,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
|
| return AddExtensionImpl(id,
|
| install_parameter,
|
| update_url,
|
| - Version(),
|
| + base::Version(),
|
| &AlwaysInstall,
|
| kIsFromSync,
|
| location,
|
| @@ -200,7 +200,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
|
| bool PendingExtensionManager::AddFromExternalFile(
|
| const std::string& id,
|
| Manifest::Location install_source,
|
| - const Version& version,
|
| + const base::Version& version,
|
| int creation_flags,
|
| bool mark_acknowledged) {
|
| // TODO(skerner): AddFromSync() checks to see if the extension is
|
| @@ -248,7 +248,7 @@ bool PendingExtensionManager::AddExtensionImpl(
|
| const std::string& id,
|
| const std::string& install_parameter,
|
| const GURL& update_url,
|
| - const Version& version,
|
| + const base::Version& version,
|
| PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
|
| bool is_from_sync,
|
| Manifest::Location install_source,
|
|
|