Moved ExtensionMessage* into extensions namespace

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/extension_message_bundle.h"
+#include "chrome/common/extensions/message_bundle.h"
 #include "chrome/common/url_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/uloc.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 static std::string& GetProcessLocale() {
   CR_DEFINE_STATIC_LOCAL(std::string, locale, ());
   return locale;
@@ skipping 24 matching lines @@
   if (!manifest->HasKey(keys::kDefaultLocale))
     return false;
 
   std::string manifest_current_locale;
   manifest->GetString(keys::kCurrentLocale, &manifest_current_locale);
   return manifest_current_locale != CurrentLocaleOrDefault();
 }
 
 // Localizes manifest value for a given key.
 static bool LocalizeManifestValue(const std::string& key,
-                                  const ExtensionMessageBundle& messages,
+                                  const extensions::MessageBundle& messages,
                                   DictionaryValue* manifest,
                                   std::string* error) {
   std::string result;
   if (!manifest->GetString(key, &result))
     return true;
 
   if (!messages.ReplaceMessages(&result, error))
     return false;
 
   manifest->SetString(key, result);
   return true;
 }
 
-bool LocalizeManifest(const ExtensionMessageBundle& messages,
+bool LocalizeManifest(const extensions::MessageBundle& messages,
                       DictionaryValue* manifest,
                       std::string* error) {
   // Initialize name.
   std::string result;
   if (!manifest->GetString(keys::kName, &result)) {
     *error = errors::kInvalidName;
     return false;
   }
   if (!LocalizeManifestValue(keys::kName, messages, manifest, error)) {
     return false;
@@ skipping 76 matching lines @@
   return true;
 }
 
 bool LocalizeExtension(const FilePath& extension_path,
                        DictionaryValue* manifest,
                        std::string* error) {
   DCHECK(manifest);
 
   std::string default_locale = GetDefaultLocaleFromManifest(*manifest, error);
 
-  scoped_ptr<ExtensionMessageBundle> message_bundle(
-      extension_file_util::LoadExtensionMessageBundle(
+  scoped_ptr<extensions::MessageBundle> message_bundle(
+      extension_file_util::LoadMessageBundle(
           extension_path, default_locale, error));
 
   if (!message_bundle.get() && !error->empty())
     return false;
 
   if (message_bundle.get() &&
       !LocalizeManifest(*message_bundle, manifest, error))
     return false;
 
   return true;
@@ skipping 96 matching lines @@
   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);
 }
 
-ExtensionMessageBundle* LoadMessageCatalogs(
+extensions::MessageBundle* LoadMessageCatalogs(
     const FilePath& locale_path,
     const std::string& default_locale,
     const std::string& application_locale,
     const std::set<std::string>& valid_locales,
     std::string* error) {
   // Order locales to load as current_locale, first_parent, ..., default_locale.
   std::vector<std::string> all_fallback_locales;
   if (!application_locale.empty() && application_locale != default_locale)
     l10n_util::GetParentLocales(application_locale, &all_fallback_locales);
   all_fallback_locales.push_back(default_locale);
 
   std::vector<linked_ptr<DictionaryValue> > catalogs;
   for (size_t i = 0; i < all_fallback_locales.size(); ++i) {
     // Skip all parent locales that are not supplied.
     if (valid_locales.find(all_fallback_locales[i]) == valid_locales.end())
       continue;
     linked_ptr<DictionaryValue> catalog(
       LoadMessageFile(locale_path, all_fallback_locales[i], error));
     if (!catalog.get()) {
       // If locale is valid, but messages.json is corrupted or missing, return
       // an error.
       return NULL;
     } else {
       catalogs.push_back(catalog);
     }
   }
 
-  return ExtensionMessageBundle::Create(catalogs, error);
+  return extensions::MessageBundle::Create(catalogs, error);
 }
 
 bool ShouldSkipValidation(const FilePath& locales_path,
                           const FilePath& locale_path,
                           const std::set<std::string>& all_locales) {
   // Since we use this string as a key in a DictionaryValue, be paranoid about
   // skipping any strings with '.'. This happens sometimes, for example with
   // '.svn' directories.
   FilePath relative_path;
   if (!locales_path.AppendRelativePath(locale_path, &relative_path)) {
     NOTREACHED();
     return true;
   }
   std::string subdir = relative_path.MaybeAsASCII();
   if (subdir.empty())
     return true;  // Non-ASCII.
 
   if (std::find(subdir.begin(), subdir.end(), '.') != subdir.end())
     return true;
 
   if (all_locales.find(subdir) == all_locales.end())
     return true;
 
   return false;
 }
 
 }  // namespace extension_l10n_util