Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: extensions/common/extension_l10n_util_unittest.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/extension_l10n_util.cc ('k') | extensions/common/extension_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/extension_l10n_util_unittest.cc
diff --git a/extensions/common/extension_l10n_util_unittest.cc b/extensions/common/extension_l10n_util_unittest.cc
index d269501058fddfe00143a38b7668924628f1b41b..89c5ff9d86afa0db885134cd9eff1f6e2546df82 100644
--- a/extensions/common/extension_l10n_util_unittest.cc
+++ b/extensions/common/extension_l10n_util_unittest.cc
@@ -4,11 +4,12 @@
#include "extensions/common/extension_l10n_util.h"
+#include <memory>
+
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -128,8 +129,9 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) {
install_dir.AppendASCII("extension_with_locales").Append(kLocaleFolder);
std::string error;
- scoped_ptr<MessageBundle> bundle(extension_l10n_util::LoadMessageCatalogs(
- install_dir, "sr", "en_US", &error));
+ std::unique_ptr<MessageBundle> bundle(
+ extension_l10n_util::LoadMessageCatalogs(install_dir, "sr", "en_US",
+ &error));
ASSERT_FALSE(NULL == bundle.get());
EXPECT_TRUE(error.empty());
EXPECT_EQ("Color", bundle->GetL10nMessage("color"));
@@ -200,7 +202,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
std::string error;
// JSON parser hides duplicates. We are going to get only one key/value
// pair at the end.
- scoped_ptr<MessageBundle> message_bundle(
+ std::unique_ptr<MessageBundle> message_bundle(
extension_l10n_util::LoadMessageCatalogs(src_path, "en", "sr", &error));
EXPECT_TRUE(NULL != message_bundle.get());
EXPECT_TRUE(error.empty());
@@ -270,7 +272,7 @@ MessageBundle* CreateManifestBundle() {
TEST(ExtensionL10nUtil, LocalizeEmptyManifest) {
base::DictionaryValue manifest;
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_FALSE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -281,7 +283,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithoutNameMsgAndEmptyDescription) {
base::DictionaryValue manifest;
manifest.SetString(keys::kName, "no __MSG");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -299,7 +301,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameMsgAndEmptyDescription) {
base::DictionaryValue manifest;
manifest.SetString(keys::kName, "__MSG_name__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -318,7 +320,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithLocalLaunchURL) {
manifest.SetString(keys::kName, "name");
manifest.SetString(keys::kLaunchLocalPath, "__MSG_launch_local_path__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -335,7 +337,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithHostedLaunchURL) {
manifest.SetString(keys::kName, "name");
manifest.SetString(keys::kLaunchWebURL, "__MSG_launch_web_url__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -352,7 +354,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithBadNameMsg) {
manifest.SetString(keys::kName, "__MSG_name_is_bad__");
manifest.SetString(keys::kDescription, "__MSG_description__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_FALSE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -377,7 +379,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionDefaultTitleMsgs) {
manifest.SetString(action_title, "__MSG_title__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -402,7 +404,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionOmniboxMsgs) {
manifest.SetString(keys::kOmniboxKeyword, "__MSG_omnibox_keyword__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -432,7 +434,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionFileHandlerTitle) {
"__MSG_file_handler_title__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -469,7 +471,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionCommandDescription) {
"__MSG_second_command_description__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -498,7 +500,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithShortName) {
manifest.SetString(keys::kShortName, "__MSG_short_name__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -515,7 +517,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithBadShortName) {
manifest.SetString(keys::kShortName, "__MSG_short_name_bad__");
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_FALSE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -546,7 +548,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithSearchProviderMsgs) {
manifest.Set(keys::kOverrideStartupPage, startup_pages);
std::string error;
- scoped_ptr<MessageBundle> messages(CreateManifestBundle());
+ std::unique_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
« no previous file with comments | « extensions/common/extension_l10n_util.cc ('k') | extensions/common/extension_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698