| Index: extensions/shell/common/shell_extensions_client.cc
|
| diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
|
| index 58a2e2fa3413c78340bd835bd40247d8bae7350f..76f5a5835e82b8b5d22135ed9ef827e040ce7c1f 100644
|
| --- a/extensions/shell/common/shell_extensions_client.cc
|
| +++ b/extensions/shell/common/shell_extensions_client.cc
|
| @@ -96,10 +96,10 @@ const std::string ShellExtensionsClient::GetProductName() {
|
| return "app_shell";
|
| }
|
|
|
| -scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
|
| +std::unique_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
|
| const std::string& name) const {
|
| - scoped_ptr<FeatureProvider> provider;
|
| - scoped_ptr<JSONFeatureProviderSource> source(
|
| + std::unique_ptr<FeatureProvider> provider;
|
| + std::unique_ptr<JSONFeatureProviderSource> source(
|
| CreateFeatureProviderSource(name));
|
| if (name == "api") {
|
| provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| @@ -119,10 +119,10 @@ scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
|
| return provider;
|
| }
|
|
|
| -scoped_ptr<JSONFeatureProviderSource>
|
| +std::unique_ptr<JSONFeatureProviderSource>
|
| ShellExtensionsClient::CreateFeatureProviderSource(
|
| const std::string& name) const {
|
| - scoped_ptr<JSONFeatureProviderSource> source(
|
| + std::unique_ptr<JSONFeatureProviderSource> source(
|
| new JSONFeatureProviderSource(name));
|
| if (name == "api") {
|
| source->LoadJSON(IDR_EXTENSION_API_FEATURES);
|
|
|