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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension_l10n_util_unittest.cc

Issue 10787002: Moved ExtensionMessage* into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq Created 8 years, 5 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 | « chrome/common/extensions/extension_l10n_util.cc ('k') | chrome/common/extensions/extension_localization_peer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_l10n_util_unittest.cc
diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc
index 5e0b46a25a9192a19abddcdbfca4be2a5bc91ab8..e45612847ec64bbf7cf93b85e9626ff55102fb0d 100644
--- a/chrome/common/extensions/extension_l10n_util_unittest.cc
+++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
@@ -13,12 +13,13 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_l10n_util.h"
-#include "chrome/common/extensions/extension_message_bundle.h"
+#include "chrome/common/extensions/message_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
using extensions::Extension;
using extensions::ExtensionInfo;
+using extensions::MessageBundle;
namespace errors = extension_manifest_errors;
namespace keys = extension_manifest_keys;
@@ -165,9 +166,8 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) {
&locales,
&error));
- scoped_ptr<ExtensionMessageBundle> bundle(
- extension_l10n_util::LoadMessageCatalogs(
- install_dir, "sr", "en_US", locales, &error));
+ scoped_ptr<MessageBundle> bundle(extension_l10n_util::LoadMessageCatalogs(
+ install_dir, "sr", "en_US", locales, &error));
ASSERT_FALSE(NULL == bundle.get());
EXPECT_TRUE(error.empty());
EXPECT_EQ("Color", bundle->GetL10nMessage("color"));
@@ -250,7 +250,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<ExtensionMessageBundle> message_bundle(
+ scoped_ptr<MessageBundle> message_bundle(
extension_l10n_util::LoadMessageCatalogs(src_path,
"en",
"sr",
@@ -261,7 +261,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
}
// Caller owns the returned object.
-ExtensionMessageBundle* CreateManifestBundle() {
+MessageBundle* CreateManifestBundle() {
linked_ptr<DictionaryValue> catalog(new DictionaryValue);
DictionaryValue* name_tree = new DictionaryValue();
@@ -304,8 +304,7 @@ ExtensionMessageBundle* CreateManifestBundle() {
catalogs.push_back(catalog);
std::string error;
- ExtensionMessageBundle* bundle =
- ExtensionMessageBundle::Create(catalogs, &error);
+ MessageBundle* bundle = MessageBundle::Create(catalogs, &error);
EXPECT_TRUE(bundle);
EXPECT_TRUE(error.empty());
@@ -315,7 +314,7 @@ ExtensionMessageBundle* CreateManifestBundle() {
TEST(ExtensionL10nUtil, LocalizeEmptyManifest) {
DictionaryValue manifest;
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_FALSE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -326,7 +325,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithoutNameMsgAndEmptyDescription) {
DictionaryValue manifest;
manifest.SetString(keys::kName, "no __MSG");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -344,7 +343,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameMsgAndEmptyDescription) {
DictionaryValue manifest;
manifest.SetString(keys::kName, "__MSG_name__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -363,7 +362,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithLocalLaunchURL) {
manifest.SetString(keys::kName, "name");
manifest.SetString(keys::kLaunchLocalPath, "__MSG_launch_local_path__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -380,7 +379,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithHostedLaunchURL) {
manifest.SetString(keys::kName, "name");
manifest.SetString(keys::kLaunchWebURL, "__MSG_launch_web_url__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -403,7 +402,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithIntents) {
manifest.Set(keys::kIntents, intents);
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -431,7 +430,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithIntentsList) {
manifest.Set(keys::kIntents, intents);
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -461,7 +460,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithBadNameMsg) {
manifest.SetString(keys::kName, "__MSG_name_is_bad__");
manifest.SetString(keys::kDescription, "__MSG_description__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_FALSE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -486,7 +485,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionDefaultTitleMsgs) {
manifest.SetString(action_title, "__MSG_title__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -511,7 +510,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionOmniboxMsgs) {
manifest.SetString(keys::kOmniboxKeyword, "__MSG_omnibox_keyword__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
@@ -541,7 +540,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionFileHandlerTitle) {
"__MSG_file_handler_title__");
std::string error;
- scoped_ptr<ExtensionMessageBundle> messages(CreateManifestBundle());
+ scoped_ptr<MessageBundle> messages(CreateManifestBundle());
EXPECT_TRUE(
extension_l10n_util::LocalizeManifest(*messages, &manifest, &error));
« no previous file with comments | « chrome/common/extensions/extension_l10n_util.cc ('k') | chrome/common/extensions/extension_localization_peer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698