Access singletons with a new GetInstance() method instead of Singleton<T>.

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>
@@ skipping 137 matching lines @@
 // Renderer helper typedefs and functions.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 // A map of message name to message.
 typedef std::map<std::string, std::string> L10nMessagesMap;
 
 // A map of extension ID to l10n message map.
 typedef std::map<std::string, L10nMessagesMap > ExtensionToL10nMessagesMap;
 
-// Unique class for Singleton.
-struct ExtensionToMessagesMap {
-  ExtensionToMessagesMap();
-  ~ExtensionToMessagesMap();
-
-  // Maps extension ID to message map.
-  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_