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

chrome/renderer/extensions/extension_api_json_validity_unittest.cc

 // 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.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 112 matching lines @@
 #define MAYBE_WithV8 DISABLED_WithV8
 #else
 #define MAYBE_WithV8 WithV8
 #endif
 
 // Use V8 to load the string resource version of extension_api.json .
 // This test mimics the method extension_api.json is loaded in
 // chrome/renderer/resources/extension_process_bindings.js .
 TEST_F(ExtensionApiJsonValidityTest, MAYBE_WithV8) {
   std::string ext_api_string =
-      bindings_utils::GetStringResource<IDR_EXTENSION_API_JSON>();
+      bindings_utils::GetStringResource(IDR_EXTENSION_API_JSON);
 
   // Create a global variable holding the text of extension_api.json .
   SetGlobalStringVar("ext_api_json_text", ext_api_string);
 
   // Parse the text of extension_api.json .  If there is a parse error,
   // an exception will be printed that includes a line number.
   std::string test_js = "var extension_api = JSON.parse(ext_api_json_text);";
   ExecuteScriptInContext(test_js, "ParseExtensionApiJson");
 }