Minor C++ fixes found by Clang.

chrome/common/extensions/extension_message_bundle.h

 // Copyright (c) 2009 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_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/linked_ptr.h"
+#include "base/string_util.h"
 #include "base/values.h"
 
 // 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 wchar_t* kContentKey;

[willchan no longer on Chromium, 2010/03/30 17:13:18]

ew, none of these are constants :(

   static const wchar_t* kMessageKey;
   static const wchar_t* kPlaceholdersKey;
 
   // Begin/end markers for placeholders and messages
   static const char* kPlaceholderBegin;
   static const char* kPlaceholderEnd;
   static const char* kMessageBegin;
   static const char* kMessageEnd;
 
   // Reserved message names in the dictionary.
@@ skipping 136 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_