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 90fea6d5fb91d34c29951c9bc06a0c2db3270d88..9d130940949ebedd0db51058603d2ca7b2a24129 100644 |
--- a/chrome/browser/extensions/external_provider_impl.cc |
+++ b/chrome/browser/extensions/external_provider_impl.cc |
@@ -343,7 +343,7 @@ void ExternalProviderImpl::RetrieveExtensionsFromPrefs( |
path = base_path.Append(external_crx); |
} |
- scoped_ptr<Version> version(new Version(external_version)); |
+ std::unique_ptr<Version> version(new Version(external_version)); |
if (!version->IsValid()) { |
LOG(WARNING) << "Malformed extension dictionary for extension: " |
<< extension_id.c_str() << ". Invalid version string \"" |
@@ -360,7 +360,7 @@ void ExternalProviderImpl::RetrieveExtensionsFromPrefs( |
<< "extensions from update URLs."; |
continue; |
} |
- scoped_ptr<GURL> update_url(new GURL(external_update_url)); |
+ std::unique_ptr<GURL> update_url(new GURL(external_update_url)); |
if (!update_url->is_valid()) { |
LOG(WARNING) << "Malformed extension dictionary for extension: " |
<< extension_id.c_str() << ". Key " << kExternalUpdateUrl |
@@ -400,8 +400,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, |
+ std::unique_ptr<Version>* version) const { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
CHECK(prefs_.get()); |
CHECK(ready_); |
@@ -557,7 +558,7 @@ void ExternalProviderImpl::CreateExternalProviders( |
if (connector && connector->IsEnterpriseManaged()) |
location = Manifest::EXTERNAL_POLICY; |
- scoped_ptr<ExternalProviderImpl> kiosk_app_provider( |
+ std::unique_ptr<ExternalProviderImpl> kiosk_app_provider( |
new ExternalProviderImpl( |
service, kiosk_app_manager->CreateExternalLoader(), profile, |
location, Manifest::INVALID_LOCATION, Extension::NO_FLAGS)); |
@@ -569,7 +570,7 @@ void ExternalProviderImpl::CreateExternalProviders( |
// Kiosk secondary app external provider. |
if (!kiosk_app_manager->secondary_app_external_loader_created()) { |
- scoped_ptr<ExternalProviderImpl> secondary_kiosk_app_provider( |
+ std::unique_ptr<ExternalProviderImpl> secondary_kiosk_app_provider( |
new ExternalProviderImpl( |
service, kiosk_app_manager->CreateSecondaryAppExternalLoader(), |
profile, Manifest::EXTERNAL_PREF, |
@@ -719,17 +720,13 @@ void ExternalProviderImpl::CreateExternalProviders( |
Extension::WAS_INSTALLED_BY_DEFAULT))); |
#endif |
- scoped_ptr<ExternalProviderImpl> drive_migration_provider( |
+ std::unique_ptr<ExternalProviderImpl> drive_migration_provider( |
new ExternalProviderImpl( |
service, |
- new ExtensionMigrator(profile, |
- extension_misc::kDriveHostedAppId, |
+ new ExtensionMigrator(profile, extension_misc::kDriveHostedAppId, |
extension_misc::kDriveExtensionId), |
- profile, |
- Manifest::EXTERNAL_PREF, |
- Manifest::EXTERNAL_PREF_DOWNLOAD, |
- Extension::FROM_WEBSTORE | |
- Extension::WAS_INSTALLED_BY_DEFAULT)); |
+ profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, |
+ Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)); |
drive_migration_provider->set_auto_acknowledge(true); |
provider_list->push_back(linked_ptr<ExternalProviderInterface>( |
drive_migration_provider.release())); |