Moved ExtensionMessage* into extensions namespace

chrome/common/extensions/extension_l10n_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #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;
 
 namespace {
 
 // crbug.com/108429: Crashing on Windows Vista bots.
 #if defined(OS_WIN)
 #define GetValidLocalesEmptyLocaleFolder \
   DISABLED_GetValidLocalesEmptyLocaleFolder
@@ skipping 126 matching lines @@
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0")
       .Append(Extension::kLocaleFolder);
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_TRUE(extension_l10n_util::GetValidLocales(install_dir,
                                                    &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"));
   EXPECT_EQ("Not in the US or GB.", bundle->GetL10nMessage("not_in_US_or_GB"));
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
@@ skipping 62 matching lines @@
   ASSERT_TRUE(
       file_util::WriteFile(locale_2.Append(Extension::kMessagesFilename),
                            data.c_str(), data.length()));
 
   std::set<std::string> valid_locales;
   valid_locales.insert("sr");
   valid_locales.insert("en");
   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",
                                                valid_locales,
                                                &error));
   EXPECT_TRUE(NULL != message_bundle.get());
   EXPECT_TRUE(error.empty());
 }
 
 // Caller owns the returned object.
-ExtensionMessageBundle* CreateManifestBundle() {
+MessageBundle* CreateManifestBundle() {
   linked_ptr<DictionaryValue> catalog(new DictionaryValue);
 
   DictionaryValue* name_tree = new DictionaryValue();
   name_tree->SetString("message", "name");
   catalog->Set("name", name_tree);
 
   DictionaryValue* description_tree = new DictionaryValue();
   description_tree->SetString("message", "description");
   catalog->Set("description", description_tree);
 
@@ skipping 22 matching lines @@
   catalog->Set("intent_title", intent_title_tree);
 
   DictionaryValue* intent_title_tree_2 = new DictionaryValue();
   intent_title_tree_2->SetString("message", "intent title 2");
   catalog->Set("intent_title2", intent_title_tree_2);
 
   std::vector<linked_ptr<DictionaryValue> > catalogs;
   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());
 
   return bundle;
 }
 
 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));
   EXPECT_EQ(std::string(errors::kInvalidName), error);
 }
 
 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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("no __MSG", result);
 
   EXPECT_FALSE(manifest.HasKey(keys::kDescription));
 
   EXPECT_TRUE(error.empty());
 }
 
 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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("name", result);
 
   EXPECT_FALSE(manifest.HasKey(keys::kDescription));
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithLocalLaunchURL) {
   DictionaryValue manifest;
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kLaunchLocalPath, &result));
   EXPECT_EQ("main.html", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithHostedLaunchURL) {
   DictionaryValue manifest;
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kLaunchWebURL, &result));
   EXPECT_EQ("http://www.google.com/", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithIntents) {
   DictionaryValue manifest;
   DictionaryValue* intents = new DictionaryValue;
   DictionaryValue* action = new DictionaryValue;
 
   action->SetString(keys::kIntentTitle, "__MSG_intent_title__");
   intents->Set("share", action);
   manifest.SetString(keys::kName, "name");
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString("intents.share.title", &result));
   EXPECT_EQ("intent title", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithIntentsList) {
   DictionaryValue manifest;
   DictionaryValue* intents = new DictionaryValue;
   ListValue* actions = new ListValue;
   DictionaryValue* action1 = new DictionaryValue;
   DictionaryValue* action2 = new DictionaryValue;
 
   action1->SetString(keys::kIntentTitle, "__MSG_intent_title__");
   action2->SetString(keys::kIntentTitle, "__MSG_intent_title2__");
   actions->Append(action1);
   actions->Append(action2);
   intents->Set("share", actions);
   manifest.SetString(keys::kName, "name");
   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));
 
   std::string result;
   ListValue* l10n_actions = NULL;
   ASSERT_TRUE(manifest.GetList("intents.share", &l10n_actions));
 
   DictionaryValue* l10n_action = NULL;
   ASSERT_TRUE(l10n_actions->GetDictionary(0, &l10n_action));
 
   ASSERT_TRUE(l10n_action->GetString(keys::kIntentTitle, &result));
   EXPECT_EQ("intent title", result);
 
   l10n_action = NULL;
   ASSERT_TRUE(l10n_actions->GetDictionary(1, &l10n_action));
 
   ASSERT_TRUE(l10n_action->GetString(keys::kIntentTitle, &result));
   EXPECT_EQ("intent title 2", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithBadNameMsg) {
   DictionaryValue manifest;
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("__MSG_name_is_bad__", result);
 
   ASSERT_TRUE(manifest.GetString(keys::kDescription, &result));
   EXPECT_EQ("__MSG_description__", result);
 
   EXPECT_EQ("Variable __MSG_name_is_bad__ used but not defined.", error);
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionDefaultTitleMsgs) {
   DictionaryValue manifest;
   manifest.SetString(keys::kName, "__MSG_name__");
   manifest.SetString(keys::kDescription, "__MSG_description__");
   std::string action_title(keys::kBrowserAction);
   action_title.append(".");
   action_title.append(keys::kPageActionDefaultTitle);
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("name", result);
 
   ASSERT_TRUE(manifest.GetString(keys::kDescription, &result));
   EXPECT_EQ("description", result);
 
   ASSERT_TRUE(manifest.GetString(action_title, &result));
   EXPECT_EQ("action title", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionOmniboxMsgs) {
   DictionaryValue manifest;
   manifest.SetString(keys::kName, "__MSG_name__");
   manifest.SetString(keys::kDescription, "__MSG_description__");
   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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("name", result);
 
   ASSERT_TRUE(manifest.GetString(keys::kDescription, &result));
   EXPECT_EQ("description", result);
 
   ASSERT_TRUE(manifest.GetString(keys::kOmniboxKeyword, &result));
   EXPECT_EQ("omnibox keyword", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionFileHandlerTitle) {
   DictionaryValue manifest;
   manifest.SetString(keys::kName, "__MSG_name__");
   manifest.SetString(keys::kDescription, "__MSG_description__");
   ListValue* handlers = new ListValue();
   manifest.Set(keys::kFileBrowserHandlers, handlers);
   DictionaryValue* handler = new DictionaryValue();
   handlers->Append(handler);
   handler->SetString(keys::kPageActionDefaultTitle,
                      "__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));
 
   std::string result;
   ASSERT_TRUE(manifest.GetString(keys::kName, &result));
   EXPECT_EQ("name", result);
 
   ASSERT_TRUE(manifest.GetString(keys::kDescription, &result));
   EXPECT_EQ("description", result);
@@ skipping 57 matching lines @@
   DictionaryValue manifest;
   manifest.SetString(keys::kDefaultLocale, "en_US");
   manifest.SetString(keys::kCurrentLocale, "sr");
 
   ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
 
   EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info));
 }
 
 }  // namespace