Moved ExtensionMessage* into extensions namespace

chrome/common/extensions/message_bundle.h

 // Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_MESSAGE_BUNDLE_H_
-#define CHROME_COMMON_EXTENSIONS_EXTENSION_MESSAGE_BUNDLE_H_
+#ifndef CHROME_COMMON_EXTENSIONS_MESSAGE_BUNDLE_H_
+#define CHROME_COMMON_EXTENSIONS_MESSAGE_BUNDLE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 
 namespace base {
 class DictionaryValue;
 }
 
+namespace extensions {
+
 // Contains localized extension messages for one locale. Any messages that the
 // locale does not provide are pulled from the default locale.
-class ExtensionMessageBundle {
+class MessageBundle {
  public:
   typedef std::map<std::string, std::string> SubstitutionMap;
   typedef std::vector<linked_ptr<base::DictionaryValue> > CatalogVector;
 
   // JSON keys of interest for messages file.
   static const char* kContentKey;
   static const char* kMessageKey;
   static const char* kPlaceholdersKey;
 
   // Begin/end markers for placeholders and messages
@@ skipping 14 matching lines @@
   static const char* kBidiEndEdgeKey;
   // Extension id gets added in the
   // browser/renderer_host/resource_message_filter.cc to enable message
   // replacement for non-localized extensions.
   static const char* kExtensionIdKey;
 
   // Values for some of the reserved messages.
   static const char* kBidiLeftEdgeValue;
   static const char* kBidiRightEdgeValue;
 
-  // Creates ExtensionMessageBundle or returns NULL if there was an error.
-  // Expects locale_catalogs to be sorted from more specific to less specific,
-  // with default catalog at the end.
-  static ExtensionMessageBundle* Create(const CatalogVector& locale_catalogs,
-                                        std::string* error);
+  // Creates MessageBundle or returns NULL if there was an error. Expects
+  // locale_catalogs to be sorted from more specific to less specific, with
+  // default catalog at the end.
+  static MessageBundle* Create(const CatalogVector& locale_catalogs,
+                               std::string* error);
 
   // Get message from the catalog with given key.
   // Returned message has all of the internal placeholders resolved to their
   // value (content).
   // Returns empty string if it can't find a message.
   // We don't use simple GetMessage name, since there is a global
   // #define GetMessage GetMessageW override in Chrome code.
   std::string GetL10nMessage(const std::string& name) const;
 
   // Get message from the given catalog with given key.
@@ skipping 23 matching lines @@
                                std::string* message,
                                std::string* error);
 
   // Allow only ascii 0-9, a-z, A-Z, and _ in the variable name.
   // Returns false if the input is empty or if it has illegal characters.
   static bool IsValidName(const std::string& name);
 
   // Getter for dictionary_.
   const SubstitutionMap* dictionary() const { return &dictionary_; }
 
-  ~ExtensionMessageBundle();
+  ~MessageBundle();
 
  private:
   // Testing friend.
-  friend class ExtensionMessageBundleTest;
+  friend class MessageBundleTest;
 
-  // Use Create to create ExtensionMessageBundle instance.
-  ExtensionMessageBundle();
+  // Use Create to create MessageBundle instance.
+  MessageBundle();
 
   // Initializes the instance from the contents of vector of catalogs.
   // If the key is not present in more specific catalog we fall back to next one
   // (less specific).
   // Returns false on error.
   bool Init(const CatalogVector& locale_catalogs, std::string* error);
 
   // Appends locale specific reserved messages to the dictionary.
   // Returns false if there was a conflict with user defined messages.
   bool AppendReservedMessagesForLocale(const std::string& application_locale,
@@ skipping 34 matching lines @@
 
 // A map of extension ID to l10n message map.
 typedef std::map<std::string, L10nMessagesMap > ExtensionToL10nMessagesMap;
 
 // Returns the extension_id to messages map.
 ExtensionToL10nMessagesMap* GetExtensionToL10nMessagesMap();
 
 // Returns message map that matches given extension_id, or NULL.
 L10nMessagesMap* GetL10nMessagesMap(const std::string& extension_id);
 
-#endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_MESSAGE_BUNDLE_H_
+}  // namsepace extensions
+
+#endif  // CHROME_COMMON_EXTENSIONS_MESSAGE_BUNDLE_H_