Add a new GetInstance() method for singleton classes, take 2.

chrome/renderer/extensions/bindings_utils.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_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_
 #define CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_
 #pragma once
 
 #include "app/resource_bundle.h"
 #include "base/linked_ptr.h"
@@ skipping 32 matching lines @@
   // v8 extension.
   virtual v8::Handle<v8::FunctionTemplate>
       GetNativeFunction(v8::Handle<v8::String> name);
 
  protected:
   // Returns a hidden variable for use by the bindings that is unreachable
   // by the page.
   static v8::Handle<v8::Value> GetChromeHidden(const v8::Arguments& args);
 };
 
-template<int kResourceId>
-struct StringResourceTemplate {
-  StringResourceTemplate()
-      : resource(ResourceBundle::GetSharedInstance().GetRawDataResource(
-            kResourceId).as_string()) {
-  }
-  std::string resource;
-};
-
-template<int kResourceId>
-const char* GetStringResource() {
-  return
-      Singleton< StringResourceTemplate<kResourceId> >::get()->resource.c_str();
-}
+const char* GetStringResource(int resource_id);
 
 // Contains information about a single javascript context.
 struct ContextInfo {
   ContextInfo(v8::Persistent<v8::Context> context,
               const std::string& extension_id,
               WebKit::WebFrame* parent_frame,
               RenderView* render_view);
   ~ContextInfo();
 
   v8::Persistent<v8::Context> context;
@@ skipping 50 matching lines @@
 // be a sub-property like "Port.dispatchOnMessage". Returns the result of
 // the function call. If an exception is thrown an empty Handle will be
 // returned.
 v8::Handle<v8::Value> CallFunctionInContext(v8::Handle<v8::Context> context,
     const std::string& function_name, int argc,
     v8::Handle<v8::Value>* argv);
 
 }  // namespace bindings_utils
 
 #endif  // CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_