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

chrome/browser/safe_browsing/safe_browsing_service.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/safe_browsing/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/lazy_instance.h"
 #include "base/path_service.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 34 matching lines @@
 
 // The default SafeBrowsingServiceFactory.  Global, made a singleton so we
 // don't leak it.
 class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory {
  public:
   virtual SafeBrowsingService* CreateSafeBrowsingService() {
     return new SafeBrowsingService();
   }
 
  private:
-  friend struct DefaultSingletonTraits<SafeBrowsingServiceFactoryImpl>;
+  friend struct base::DefaultLazyInstanceTraits<SafeBrowsingServiceFactoryImpl>;
 
   SafeBrowsingServiceFactoryImpl() { }
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactoryImpl);
 };
 
+static base::LazyInstance<SafeBrowsingServiceFactoryImpl>
+    g_safe_browsing_service_factory_impl(base::LINKER_INITIALIZED);
+
 struct SafeBrowsingService::WhiteListedEntry {
   int render_process_host_id;
   int render_view_id;
   std::string domain;
   UrlCheckResult result;
 };
 
 SafeBrowsingService::UnsafeResource::UnsafeResource()
     : resource_type(ResourceType::MAIN_FRAME),
       threat_type(URL_SAFE),
       client(NULL),
       render_process_host_id(-1),
       render_view_id(-1) {
 }
 
 SafeBrowsingService::UnsafeResource::~UnsafeResource() {}
 
 SafeBrowsingService::SafeBrowsingCheck::SafeBrowsingCheck()
     : client(NULL),
       need_get_hash(false),
       result(URL_SAFE) {
 }
 
 SafeBrowsingService::SafeBrowsingCheck::~SafeBrowsingCheck() {}
 
 /* static */
 SafeBrowsingService* SafeBrowsingService::CreateSafeBrowsingService() {
   if (!factory_)
-    factory_ = Singleton<SafeBrowsingServiceFactoryImpl>::get();
+    factory_ = g_safe_browsing_service_factory_impl.Pointer();
   return factory_->CreateSafeBrowsingService();
 }
 
 SafeBrowsingService::SafeBrowsingService()
     : database_(NULL),
       protocol_manager_(NULL),
       enabled_(false),
       update_in_progress_(false),
       database_update_in_progress_(false),
       closing_database_(false) {
@@ skipping 741 matching lines @@
   if (!enabled_)
     return;
 
   DVLOG(1) << "ReportSafeBrowsingHit: " << malicious_url << " " << page_url
            << " " << referrer_url << " " << is_subresource << " "
            << threat_type;
   protocol_manager_->ReportSafeBrowsingHit(malicious_url, page_url,
                                            referrer_url, is_subresource,
                                            threat_type);
 }