Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/public/test/test_keyed_service_provider.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more errors Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ios/chrome/browser/favicon/favicon_service_factory.h ('K') | « ios/public/test/fake_sync_service_factory.cc ('k') | ios/web/browser_url_rewriter_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/public/test/test_keyed_service_provider.cc
diff --git a/ios/public/test/test_keyed_service_provider.cc b/ios/public/test/test_keyed_service_provider.cc
index 5566fa33ae8d273f3a6a0cf8a90cbcbbc3dfe925..4702ac47f9a7b977ff89101111bcc047656c4053 100644
--- a/ios/public/test/test_keyed_service_provider.cc
+++ b/ios/public/test/test_keyed_service_provider.cc
@@ -25,7 +25,7 @@ class MissingServiceKeyedServiceFactory
static MissingServiceKeyedServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<MissingServiceKeyedServiceFactory>;
+ friend struct base::DefaultSingletonTraits<MissingServiceKeyedServiceFactory>;
MissingServiceKeyedServiceFactory();
~MissingServiceKeyedServiceFactory() override;
@@ -40,7 +40,7 @@ class MissingServiceKeyedServiceFactory
// static
MissingServiceKeyedServiceFactory*
MissingServiceKeyedServiceFactory::GetInstance() {
- return Singleton<MissingServiceKeyedServiceFactory>::get();
+ return base::Singleton<MissingServiceKeyedServiceFactory>::get();
}
MissingServiceKeyedServiceFactory::MissingServiceKeyedServiceFactory()
« ios/chrome/browser/favicon/favicon_service_factory.h ('K') | « ios/public/test/fake_sync_service_factory.cc ('k') | ios/web/browser_url_rewriter_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698