Move CrxFile, FileReader, ExtensionResource to src/extensions.

chrome/common/extensions/extension_l10n_util.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 "chrome/common/extensions/extension_l10n_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "chrome/common/url_constants.h"
+#include "extensions/common/constants.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 static std::string& GetProcessLocale() {
   CR_DEFINE_STATIC_LOCAL(std::string, locale, ());
   return locale;
 }
 
 namespace extension_l10n_util {
 
 void SetProcessLocale(const std::string& locale) {
   GetProcessLocale() = locale;
 }
 
 std::string GetDefaultLocaleFromManifest(const DictionaryValue& manifest,
                                          std::string* error) {
   std::string default_locale;
   if (manifest.GetString(keys::kDefaultLocale, &default_locale))
     return default_locale;
 
   *error = errors::kInvalidDefaultLocale;
   return "";
 
 }
 
-bool ShouldRelocalizeManifest(const extensions::ExtensionInfo& info) {
-  DictionaryValue* manifest = info.extension_manifest.get();
+bool ShouldRelocalizeManifest(DictionaryValue* const manifest) {

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

I think you want const DictionaryValue* here, since you're not modifying the
manifest.

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

Done.

   if (!manifest)
     return false;
 
   if (!manifest->HasKey(keys::kDefaultLocale))
     return false;
 
   std::string manifest_current_locale;
   manifest->GetString(keys::kCurrentLocale, &manifest_current_locale);
   return manifest_current_locale != CurrentLocaleOrDefault();
 }
@@ skipping 138 matching lines @@
     return true;
   if (chrome_locales.find(locale_name) == chrome_locales.end()) {
     // Warn if there is an extension locale that's not in the Chrome list,
     // but don't fail.
     DLOG(WARNING) << base::StringPrintf("Supplied locale %s is not supported.",
                                         locale_name.c_str());
     return true;
   }
   // Check if messages file is actually present (but don't check content).
   if (file_util::PathExists(
-      locale_folder.Append(extensions::Extension::kMessagesFilename))) {
+      locale_folder.Append(extensions::kMessagesFilename))) {
     valid_locales->insert(locale_name);
   } else {
     *error = base::StringPrintf("Catalog file is missing for locale %s.",
                                 locale_name.c_str());
     return false;
   }
 
   return true;
 }
 
@@ skipping 61 matching lines @@
 }
 
 // Loads contents of the messages file for given locale. If file is not found,
 // or there was parsing error we return NULL and set |error|.
 // Caller owns the returned object.
 static DictionaryValue* LoadMessageFile(const base::FilePath& locale_path,
                                         const std::string& locale,
                                         std::string* error) {
   std::string extension_locale = locale;
   base::FilePath file = locale_path.AppendASCII(extension_locale)
-      .Append(extensions::Extension::kMessagesFilename);
+      .Append(extensions::kMessagesFilename);
   JSONFileValueSerializer messages_serializer(file);
   Value *dictionary = messages_serializer.Deserialize(NULL, error);
   if (!dictionary && error->empty()) {
     // JSONFileValueSerializer just returns NULL if file cannot be found. It
     // doesn't set the error, so we have to do it.
     *error = base::StringPrintf("Catalog file is missing for locale %s.",
                                 extension_locale.c_str());
   }
 
   return static_cast<DictionaryValue*>(dictionary);
@@ skipping 58 matching lines @@
 ScopedLocaleForTest::ScopedLocaleForTest(const std::string& locale)
     : locale_(extension_l10n_util::CurrentLocaleOrDefault()) {
   extension_l10n_util::SetProcessLocale(locale);
 }
 
 ScopedLocaleForTest::~ScopedLocaleForTest() {
   extension_l10n_util::SetProcessLocale(locale_);
 }
 
 }  // namespace extension_l10n_util