| Index: chromeos/system/statistics_provider.cc
|
| diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc
|
| index bac717360345205f2b0fa6e9d399d8ae2c3e1f37..c2cfcdbf7c9830e46aafc5001aaa196d6f2b0e41 100644
|
| --- a/chromeos/system/statistics_provider.cc
|
| +++ b/chromeos/system/statistics_provider.cc
|
| @@ -113,7 +113,7 @@ class StatisticsProviderImpl : public StatisticsProvider {
|
|
|
| protected:
|
| typedef std::map<std::string, bool> MachineFlags;
|
| - friend struct DefaultSingletonTraits<StatisticsProviderImpl>;
|
| + friend struct base::DefaultSingletonTraits<StatisticsProviderImpl>;
|
|
|
| StatisticsProviderImpl();
|
| ~StatisticsProviderImpl() override;
|
| @@ -342,8 +342,9 @@ void StatisticsProviderImpl::LoadOemManifestFromFile(
|
| }
|
|
|
| StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
|
| - return Singleton<StatisticsProviderImpl,
|
| - DefaultSingletonTraits<StatisticsProviderImpl> >::get();
|
| + return base::Singleton<
|
| + StatisticsProviderImpl,
|
| + base::DefaultSingletonTraits<StatisticsProviderImpl>>::get();
|
| }
|
|
|
| static StatisticsProvider* g_test_statistics_provider = NULL;
|
|
|