| Index: chrome/browser/chromeos/offline/offline_load_service.cc
|
| diff --git a/chrome/browser/chromeos/offline/offline_load_service.cc b/chrome/browser/chromeos/offline/offline_load_service.cc
|
| index 08f2362d2ac96a4f523fe14f3fcc12143422e50f..ace85d8b4868b1ad5b4680812445956fbccdb1bc 100644
|
| --- a/chrome/browser/chromeos/offline/offline_load_service.cc
|
| +++ b/chrome/browser/chromeos/offline/offline_load_service.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "chrome/browser/chromeos/offline/offline_load_service.h"
|
|
|
| +#include "base/lazy_instance.h"
|
| #include "base/ref_counted.h"
|
| -#include "base/singleton.h"
|
| #include "chrome/browser/browser_thread.h"
|
| #include "chrome/browser/tab_contents/navigation_controller.h"
|
| #include "chrome/browser/tab_contents/tab_contents.h"
|
| @@ -24,7 +24,7 @@ class OfflineLoadServiceSingleton {
|
| }
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<OfflineLoadServiceSingleton>;
|
| + friend struct base::DefaultLazyInstanceTraits<OfflineLoadServiceSingleton>;
|
| OfflineLoadServiceSingleton()
|
| : offline_load_service_(new chromeos::OfflineLoadService()) {}
|
| virtual ~OfflineLoadServiceSingleton() {}
|
| @@ -34,9 +34,12 @@ class OfflineLoadServiceSingleton {
|
| DISALLOW_COPY_AND_ASSIGN(OfflineLoadServiceSingleton);
|
| };
|
|
|
| +static base::LazyInstance<OfflineLoadServiceSingleton>
|
| + g_offline_load_service_singleton(base::LINKER_INITIALIZED);
|
| +
|
| // static
|
| OfflineLoadService* OfflineLoadService::Get() {
|
| - return Singleton<OfflineLoadServiceSingleton>::get()->offline_load_service();
|
| + return g_offline_load_service_singleton.Get().offline_load_service();
|
| }
|
|
|
| void OfflineLoadService::Observe(NotificationType type,
|
|
|