FBTF: Forward declare and move constructors in chrome/common/extensions/.

chrome/common/extensions/extension_message_bundle.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/linked_ptr.h"
-#include "base/string_util.h"
-#include "base/values.h"
+
+class DictionaryValue;
 
 // Contains localized extension messages for one locale. Any messages that the
 // locale does not provide are pulled from the default locale.
 class ExtensionMessageBundle {
  public:
   typedef std::map<std::string, std::string> SubstitutionMap;
   typedef std::vector<linked_ptr<DictionaryValue> > CatalogVector;
 
   // JSON keys of interest for messages file.
   static const char* kContentKey;
@@ skipping 61 matching lines @@
   // replacement.
   // Public for easier unittesting.
   static bool ReplaceVariables(const SubstitutionMap& variables,
                                const std::string& var_begin,
                                const std::string& var_end,
                                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.
-  template<typename str>
-  static bool IsValidName(const str& name) {
-    if (name.empty())
-      return false;
-
-    typename str::const_iterator it = name.begin();
-    for (; it != name.end(); ++it) {
-      // Allow only ascii 0-9, a-z, A-Z, and _ in the name.
-      if (!IsAsciiAlpha(*it) && !IsAsciiDigit(*it) && *it != '_' && *it != '@')
-        return false;
-      }
-
-    return true;
-  }
+  static bool IsValidName(const std::string& name);
 
   // Getter for dictionary_.
   const SubstitutionMap* dictionary() const { return &dictionary_; }
 
+  ~ExtensionMessageBundle();
+
  private:
   // Testing friend.
   friend class ExtensionMessageBundleTest;
 
   // Use Create to create ExtensionMessageBundle instance.
   ExtensionMessageBundle();
 
   // 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).
@@ skipping 47 matching lines @@
   ExtensionToL10nMessagesMap messages_map;
 };
 
 // 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_