Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/extensions/extension_omnibox_api.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 "chrome/browser/extensions/extension_omnibox_api.h"
 
 #include "base/json/json_writer.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/notification_service.h"
 
 namespace events {
@@ skipping 10 matching lines @@
     "Suggestion descriptionStyles contains an offset longer than the"
     " description text";
 
 const char kSuggestionContent[] = "content";
 const char kSuggestionDescription[] = "description";
 const char kSuggestionDescriptionStyles[] = "descriptionStyles";
 const char kDescriptionStylesType[] = "type";
 const char kDescriptionStylesOffset[] = "offset";
 const char kDescriptionStylesLength[] = "length";
 
+static base::LazyInstance<PropertyAccessor<ExtensionOmniboxSuggestion> >
+    g_extension_omnibox_suggestion_property_accessor(base::LINKER_INITIALIZED);
+
 PropertyAccessor<ExtensionOmniboxSuggestion>& GetPropertyAccessor() {
-  return *Singleton< PropertyAccessor<ExtensionOmniboxSuggestion> >::get();
+  return g_extension_omnibox_suggestion_property_accessor.Get();
 }
 
 // Returns the suggestion object set by the extension via the
 // omnibox.setDefaultSuggestion call, or NULL if it was never set.
 const ExtensionOmniboxSuggestion* GetDefaultSuggestionForExtension(
     Profile* profile, const std::string& extension_id) {
   const Extension* extension =
       profile->GetExtensionsService()->GetExtensionById(extension_id, false);
   if (!extension)
     return NULL;
@@ skipping 202 matching lines @@
     description.replace(placeholder, kPlaceholderText.length(), replacement);
 
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(UTF16ToWide(description));
 }