| Index: chrome/browser/extensions/external_provider_impl.cc
|
| diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
|
| index 7844bca135e6f2f5010e100d8bf1aab0e5fec90c..dea7367f7457189ae35ada7385d3b1a242171d98 100644
|
| --- a/chrome/browser/extensions/external_provider_impl.cc
|
| +++ b/chrome/browser/extensions/external_provider_impl.cc
|
| @@ -285,7 +285,7 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) {
|
| path = base_path.Append(external_crx);
|
| }
|
|
|
| - Version version(external_version);
|
| + base::Version version(external_version);
|
| if (!version.IsValid()) {
|
| LOG(WARNING) << "Malformed extension dictionary for extension: "
|
| << extension_id.c_str() << ". Invalid version string \""
|
| @@ -347,8 +347,9 @@ bool ExternalProviderImpl::HasExtension(
|
| }
|
|
|
| bool ExternalProviderImpl::GetExtensionDetails(
|
| - const std::string& id, Manifest::Location* location,
|
| - scoped_ptr<Version>* version) const {
|
| + const std::string& id,
|
| + Manifest::Location* location,
|
| + scoped_ptr<base::Version>* version) const {
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| CHECK(prefs_.get());
|
| CHECK(ready_);
|
| @@ -368,7 +369,7 @@ bool ExternalProviderImpl::GetExtensionDetails(
|
| return false;
|
|
|
| if (version)
|
| - version->reset(new Version(external_version));
|
| + version->reset(new base::Version(external_version));
|
|
|
| } else {
|
| NOTREACHED(); // Chrome should not allow prefs to get into this state.
|
| @@ -389,9 +390,9 @@ bool ExternalProviderImpl::HandleMinProfileVersion(
|
| if (profile_ &&
|
| extension->GetString(kMinProfileCreatedByVersion,
|
| &min_profile_created_by_version)) {
|
| - Version profile_version(
|
| + base::Version profile_version(
|
| profile_->GetPrefs()->GetString(prefs::kProfileCreatedByVersion));
|
| - Version min_version(min_profile_created_by_version);
|
| + base::Version min_version(min_profile_created_by_version);
|
| if (min_version.IsValid() && profile_version.CompareTo(min_version) < 0) {
|
| unsupported_extensions->insert(extension_id);
|
| VLOG(1) << "Skip installing (or uninstall) external extension: "
|
|
|