Index: chrome/common/extensions/api/common_extension_api_unittest.cc |
diff --git a/chrome/common/extensions/api/common_extension_api_unittest.cc b/chrome/common/extensions/api/common_extension_api_unittest.cc |
index 1747e22e0da99c5ebb9abdff071cac9b09661591..d8a9555ae48191a6c0a8bbb4be83a14a51871ac8 100644 |
--- a/chrome/common/extensions/api/common_extension_api_unittest.cc |
+++ b/chrome/common/extensions/api/common_extension_api_unittest.cc |
@@ -6,6 +6,7 @@ |
#include <stddef.h> |
+#include <memory> |
#include <string> |
#include <utility> |
#include <vector> |
@@ -16,7 +17,6 @@ |
#include "base/json/json_writer.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/path_service.h" |
#include "base/strings/stringprintf.h" |
#include "base/values.h" |
@@ -44,11 +44,12 @@ TEST(ExtensionAPITest, Creation) { |
ExtensionAPI* shared_instance = ExtensionAPI::GetSharedInstance(); |
EXPECT_EQ(shared_instance, ExtensionAPI::GetSharedInstance()); |
- scoped_ptr<ExtensionAPI> new_instance( |
+ std::unique_ptr<ExtensionAPI> new_instance( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
EXPECT_NE(new_instance.get(), |
- scoped_ptr<ExtensionAPI>( |
- ExtensionAPI::CreateWithDefaultConfiguration()).get()); |
+ std::unique_ptr<ExtensionAPI>( |
+ ExtensionAPI::CreateWithDefaultConfiguration()) |
+ .get()); |
ExtensionAPI empty_instance; |
@@ -173,8 +174,9 @@ TEST(ExtensionAPITest, APIFeatures) { |
ASSERT_TRUE(base::ReadFileToString( |
api_features_path, &api_features_str)) << "api_features.json"; |
- scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( |
- base::JSONReader::Read(api_features_str).release())); |
+ std::unique_ptr<base::DictionaryValue> value( |
+ static_cast<base::DictionaryValue*>( |
+ base::JSONReader::Read(api_features_str).release())); |
BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); |
for (size_t i = 0; i < arraysize(test_data); ++i) { |
@@ -266,8 +268,9 @@ TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) { |
ASSERT_TRUE(base::ReadFileToString( |
api_features_path, &api_features_str)) << "api_features.json"; |
- scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( |
- base::JSONReader::Read(api_features_str).release())); |
+ std::unique_ptr<base::DictionaryValue> value( |
+ static_cast<base::DictionaryValue*>( |
+ base::JSONReader::Read(api_features_str).release())); |
BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); |
for (size_t i = 0; i < arraysize(test_data); ++i) { |
@@ -292,7 +295,8 @@ TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) { |
} |
TEST(ExtensionAPITest, LazyGetSchema) { |
- scoped_ptr<ExtensionAPI> apis(ExtensionAPI::CreateWithDefaultConfiguration()); |
+ std::unique_ptr<ExtensionAPI> apis( |
+ ExtensionAPI::CreateWithDefaultConfiguration()); |
EXPECT_EQ(NULL, apis->GetSchema(std::string())); |
EXPECT_EQ(NULL, apis->GetSchema(std::string())); |
@@ -318,7 +322,7 @@ scoped_refptr<Extension> CreateExtensionWithPermissions( |
manifest.SetString("version", "1.0"); |
manifest.SetInteger("manifest_version", 2); |
{ |
- scoped_ptr<base::ListValue> permissions_list(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> permissions_list(new base::ListValue()); |
for (std::set<std::string>::const_iterator i = permissions.begin(); |
i != permissions.end(); ++i) { |
permissions_list->Append(new base::StringValue(*i)); |
@@ -352,7 +356,7 @@ TEST(ExtensionAPITest, ExtensionWithUnprivilegedAPIs) { |
extension = CreateExtensionWithPermissions(permissions); |
} |
- scoped_ptr<ExtensionAPI> extension_api( |
+ std::unique_ptr<ExtensionAPI> extension_api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
const FeatureProvider& api_features = *FeatureProvider::GetAPIFeatures(); |
@@ -445,7 +449,7 @@ scoped_refptr<Extension> CreatePackagedAppWithPermissions( |
app->Set("background", background); |
values.Set(manifest_keys::kApp, app); |
{ |
- scoped_ptr<base::ListValue> permissions_list(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> permissions_list(new base::ListValue()); |
for (std::set<std::string>::const_iterator i = permissions.begin(); |
i != permissions.end(); ++i) { |
permissions_list->Append(new base::StringValue(*i)); |
@@ -464,7 +468,7 @@ scoped_refptr<Extension> CreatePackagedAppWithPermissions( |
TEST(ExtensionAPITest, HostedAppPermissions) { |
scoped_refptr<Extension> extension = CreateHostedApp(); |
- scoped_ptr<ExtensionAPI> extension_api( |
+ std::unique_ptr<ExtensionAPI> extension_api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
// "runtime" and "tabs" should not be available in hosted apps. |
@@ -491,8 +495,7 @@ TEST(ExtensionAPITest, HostedAppPermissions) { |
} |
TEST(ExtensionAPITest, AppAndFriendsAvailability) { |
- |
- scoped_ptr<ExtensionAPI> extension_api( |
+ std::unique_ptr<ExtensionAPI> extension_api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
// Make sure chrome.app.runtime and chrome.app.window are available to apps, |
@@ -549,7 +552,7 @@ TEST(ExtensionAPITest, ExtensionWithDependencies) { |
{ |
scoped_refptr<Extension> extension = |
CreateExtensionWithPermission("ttsEngine"); |
- scoped_ptr<ExtensionAPI> api( |
+ std::unique_ptr<ExtensionAPI> api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
EXPECT_TRUE(api->IsAvailable("ttsEngine", |
extension.get(), |
@@ -566,7 +569,7 @@ TEST(ExtensionAPITest, ExtensionWithDependencies) { |
{ |
scoped_refptr<Extension> extension = |
CreateExtensionWithPermission("tts"); |
- scoped_ptr<ExtensionAPI> api( |
+ std::unique_ptr<ExtensionAPI> api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
EXPECT_FALSE(api->IsAvailable("ttsEngine", |
extension.get(), |
@@ -586,7 +589,8 @@ bool MatchesURL( |
} |
TEST(ExtensionAPITest, URLMatching) { |
- scoped_ptr<ExtensionAPI> api(ExtensionAPI::CreateWithDefaultConfiguration()); |
+ std::unique_ptr<ExtensionAPI> api( |
+ ExtensionAPI::CreateWithDefaultConfiguration()); |
// "app" API is available to all URLs that content scripts can be injected. |
EXPECT_TRUE(MatchesURL(api.get(), "app", "http://example.com/example.html")); |
@@ -630,7 +634,8 @@ TEST(ExtensionAPITest, GetAPINameFromFullName) { |
{ "bookmarkManagerPrivate.copy", "bookmarkManagerPrivate", "copy" } |
}; |
- scoped_ptr<ExtensionAPI> api(ExtensionAPI::CreateWithDefaultConfiguration()); |
+ std::unique_ptr<ExtensionAPI> api( |
+ ExtensionAPI::CreateWithDefaultConfiguration()); |
for (size_t i = 0; i < arraysize(test_data); ++i) { |
std::string child_name; |
std::string api_name = api->GetAPINameFromFullName(test_data[i].input, |
@@ -641,7 +646,8 @@ TEST(ExtensionAPITest, GetAPINameFromFullName) { |
} |
TEST(ExtensionAPITest, DefaultConfigurationFeatures) { |
- scoped_ptr<ExtensionAPI> api(ExtensionAPI::CreateWithDefaultConfiguration()); |
+ std::unique_ptr<ExtensionAPI> api( |
+ ExtensionAPI::CreateWithDefaultConfiguration()); |
SimpleFeature* bookmarks = static_cast<SimpleFeature*>( |
api->GetFeatureDependency("api:bookmarks")); |
@@ -672,8 +678,10 @@ TEST(ExtensionAPITest, DefaultConfigurationFeatures) { |
TEST(ExtensionAPITest, FeaturesRequireContexts) { |
// TODO(cduvall): Make this check API featues. |
- scoped_ptr<base::DictionaryValue> api_features1(new base::DictionaryValue()); |
- scoped_ptr<base::DictionaryValue> api_features2(new base::DictionaryValue()); |
+ std::unique_ptr<base::DictionaryValue> api_features1( |
+ new base::DictionaryValue()); |
+ std::unique_ptr<base::DictionaryValue> api_features2( |
+ new base::DictionaryValue()); |
base::DictionaryValue* test1 = new base::DictionaryValue(); |
base::DictionaryValue* test2 = new base::DictionaryValue(); |
base::ListValue* contexts = new base::ListValue(); |
@@ -815,7 +823,7 @@ TEST(ExtensionAPITest, NoPermissions) { |
{ "runtime.connectNative", false }, |
}; |
- scoped_ptr<ExtensionAPI> extension_api( |
+ std::unique_ptr<ExtensionAPI> extension_api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
scoped_refptr<Extension> extension = |
BuildExtension(ExtensionBuilder()).Build(); |
@@ -833,7 +841,7 @@ TEST(ExtensionAPITest, NoPermissions) { |
// Tests that permissions that require manifest keys are available when those |
// keys are present. |
TEST(ExtensionAPITest, ManifestKeys) { |
- scoped_ptr<ExtensionAPI> extension_api( |
+ std::unique_ptr<ExtensionAPI> extension_api( |
ExtensionAPI::CreateWithDefaultConfiguration()); |
scoped_refptr<Extension> extension = |