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

base/string_util.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/string_util.h"
 
 #include "build/build_config.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ skipping 20 matching lines @@
 namespace {
 
 // Force the singleton used by Empty[W]String[16] to be a unique type. This
 // prevents other code that might accidentally use Singleton<string> from
 // getting our internal one.
 struct EmptyStrings {
   EmptyStrings() {}
   const std::string s;
   const std::wstring ws;
   const string16 s16;
+
+  static EmptyStrings* GetInstance() {
+    return Singleton<EmptyStrings>::get();
+  }
 };
 
 // Used by ReplaceStringPlaceholders to track the position in the string of
 // replaced parameters.
 struct ReplacementOffset {
   ReplacementOffset(uintptr_t parameter, size_t offset)
       : parameter(parameter),
         offset(offset) {}
 
   // Index of the parameter.
@@ skipping 44 matching lines @@
     }
   }
 
   return true;
 }
 
 }  // namespace base
 
 
 const std::string& EmptyString() {
-  return Singleton<EmptyStrings>::get()->s;
+  return EmptyStrings::GetInstance()->s;
 }
 
 const std::wstring& EmptyWString() {
-  return Singleton<EmptyStrings>::get()->ws;
+  return EmptyStrings::GetInstance()->ws;
 }
 
 const string16& EmptyString16() {
-  return Singleton<EmptyStrings>::get()->s16;
+  return EmptyStrings::GetInstance()->s16;
 }
 
 #define WHITESPACE_UNICODE \
   0x0009, /* <control-0009> to <control-000D> */ \
   0x000A,                                        \
   0x000B,                                        \
   0x000C,                                        \
   0x000D,                                        \
   0x0020, /* Space */                            \
   0x0085, /* <control-0085> */                   \
@@ skipping 996 matching lines @@
       int rstr_len = (max_len - 3) / 2;
       int lstr_len = rstr_len + ((max_len - 3) % 2);
       output->assign(input.substr(0, lstr_len) + L"..." +
                      input.substr(input.length() - rstr_len));
       break;
     }
   }
 
   return true;
 }