Move CrxFile, FileReader, ExtensionResource to src/extensions.

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_util.h"
 #include "base/files/file_path.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/values.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/message_bundle.h"
+#include "extensions/common/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using extensions::Extension;
-using extensions::ExtensionInfo;
-using extensions::Manifest;
 using extensions::MessageBundle;
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 namespace {
 
 TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);

[Jeffrey Yasskin, 2013/03/22 20:26:50]

Maybe add "using extensions::kLocaleFolder;"

[Yoyo Zhou, 2013/03/22 21:33:32]

Done.

   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_FALSE(extension_l10n_util::GetValidLocales(src_path,
                                                     &locales,
                                                     &error));
 
   EXPECT_TRUE(locales.empty());
 }
 
 TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
   ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("sr")));
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_FALSE(extension_l10n_util::GetValidLocales(src_path,
                                                     &locales,
                                                     &error));
 
   EXPECT_TRUE(locales.empty());
 }
 
 TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
   // Supported locale.
   base::FilePath locale_1 = src_path.AppendASCII("sr");
   ASSERT_TRUE(file_util::CreateDirectory(locale_1));
   std::string data("whatever");
   ASSERT_TRUE(file_util::WriteFile(
-      locale_1.Append(Extension::kMessagesFilename),
+      locale_1.Append(extensions::kMessagesFilename),
       data.c_str(), data.length()));
   // Unsupported locale.
   ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("xxx_yyy")));
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_TRUE(extension_l10n_util::GetValidLocales(src_path,
                                                    &locales,
                                                    &error));
 
   EXPECT_FALSE(locales.empty());
   EXPECT_TRUE(locales.find("sr") != locales.end());
   EXPECT_FALSE(locales.find("xxx_yyy") != locales.end());
 }
 
 TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocalesAndMessagesFile) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0")
-      .Append(Extension::kLocaleFolder);
+      .Append(extensions::kLocaleFolder);
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_TRUE(extension_l10n_util::GetValidLocales(install_dir,
                                                    &locales,
                                                    &error));
   EXPECT_EQ(3U, locales.size());
   EXPECT_TRUE(locales.find("sr") != locales.end());
   EXPECT_TRUE(locales.find("en") != locales.end());
   EXPECT_TRUE(locales.find("en_US") != locales.end());
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0")
-      .Append(Extension::kLocaleFolder);
+      .Append(extensions::kLocaleFolder);
 
   std::string error;
   std::set<std::string> locales;
   EXPECT_TRUE(extension_l10n_util::GetValidLocales(install_dir,
                                                    &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) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   std::set<std::string> valid_locales;
   valid_locales.insert("sr");
   valid_locales.insert("en");
   std::string error;
   EXPECT_TRUE(NULL == extension_l10n_util::LoadMessageCatalogs(src_path,
                                                                "en",
                                                                "sr",
                                                                valid_locales,
                                                                &error));
   EXPECT_FALSE(error.empty());
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   base::FilePath locale = src_path.AppendASCII("sr");
   ASSERT_TRUE(file_util::CreateDirectory(locale));
 
   std::string data = "{ \"name\":";
   ASSERT_TRUE(
-      file_util::WriteFile(locale.Append(Extension::kMessagesFilename),
+      file_util::WriteFile(locale.Append(extensions::kMessagesFilename),
                            data.c_str(), data.length()));
 
   std::set<std::string> valid_locales;
   valid_locales.insert("sr");
   valid_locales.insert("en_US");
   std::string error;
   EXPECT_TRUE(NULL == extension_l10n_util::LoadMessageCatalogs(src_path,
                                                                "en_US",
                                                                "sr",
                                                                valid_locales,
                                                                &error));
   EXPECT_EQ("Line: 1, column: 10, Unexpected token.", error);
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
+  base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   base::FilePath locale_1 = src_path.AppendASCII("en");
   ASSERT_TRUE(file_util::CreateDirectory(locale_1));
 
   std::string data =
     "{ \"name\": { \"message\": \"something\" }, "
     "\"name\": { \"message\": \"something else\" } }";
   ASSERT_TRUE(
-      file_util::WriteFile(locale_1.Append(Extension::kMessagesFilename),
+      file_util::WriteFile(locale_1.Append(extensions::kMessagesFilename),
                            data.c_str(), data.length()));
 
   base::FilePath locale_2 = src_path.AppendASCII("sr");
   ASSERT_TRUE(file_util::CreateDirectory(locale_2));
 
   ASSERT_TRUE(
-      file_util::WriteFile(locale_2.Append(Extension::kMessagesFilename),
+      file_util::WriteFile(locale_2.Append(extensions::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<MessageBundle> message_bundle(
       extension_l10n_util::LoadMessageCatalogs(src_path,
@@ skipping 298 matching lines @@
   EXPECT_EQ("description", result);
 
   ASSERT_TRUE(handler->GetString(keys::kPageActionDefaultTitle, &result));
   EXPECT_EQ("file handler title", result);
 
   EXPECT_TRUE(error.empty());
 }
 
 // Try with NULL manifest.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) {
-  ExtensionInfo info(NULL, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(NULL));
 }
 
 // Try with default and current locales missing.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestEmptyManifest) {
   DictionaryValue manifest;
-  ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(&manifest));
 }
 
 // Try with missing current_locale.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithDefaultLocale) {
   DictionaryValue manifest;
   manifest.SetString(keys::kDefaultLocale, "en_US");
-
-  ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(&manifest));
 }
 
 // Try with missing default_locale.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithCurrentLocale) {
   DictionaryValue manifest;
   manifest.SetString(keys::kCurrentLocale,
                      extension_l10n_util::CurrentLocaleOrDefault());
-
-  ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(&manifest));
 }
 
 // Try with all data present, but with same current_locale as system locale.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestSameCurrentLocale) {
   DictionaryValue manifest;
   manifest.SetString(keys::kDefaultLocale, "en_US");
   manifest.SetString(keys::kCurrentLocale,
                      extension_l10n_util::CurrentLocaleOrDefault());
-
-  ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(&manifest));
 }
 
 // Try with all data present, but with different current_locale.
 TEST(ExtensionL10nUtil, ShouldRelocalizeManifestDifferentCurrentLocale) {
   DictionaryValue manifest;
   manifest.SetString(keys::kDefaultLocale, "en_US");
   manifest.SetString(keys::kCurrentLocale, "sr");
-
-  ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::UNPACKED);
-
-  EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info));
+  EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(&manifest));
 }
 
 TEST(ExtensionL10nUtil, GetAllFallbackLocales) {
   std::vector<std::string> fallback_locales;
   extension_l10n_util::GetAllFallbackLocales("en_US", "all", &fallback_locales);
   ASSERT_EQ(3U, fallback_locales.size());
 
   CHECK_EQ("en_US", fallback_locales[0]);
   CHECK_EQ("en", fallback_locales[1]);
   CHECK_EQ("all", fallback_locales[2]);
 }
 
 }  // namespace