summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/search')
-rw-r--r--chrome/browser/search/hotword_service_factory.cc2
-rw-r--r--chrome/browser/search/hotword_service_factory.h2
-rw-r--r--chrome/browser/search/instant_service_factory.cc2
-rw-r--r--chrome/browser/search/instant_service_factory.h2
-rw-r--r--chrome/browser/search/suggestions/suggestions_service_factory.cc2
-rw-r--r--chrome/browser/search/suggestions/suggestions_service_factory.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc
index 7324dcc..ddd91b1 100644
--- a/chrome/browser/search/hotword_service_factory.cc
+++ b/chrome/browser/search/hotword_service_factory.cc
@@ -26,7 +26,7 @@ HotwordService* HotwordServiceFactory::GetForProfile(BrowserContext* context) {
// static
HotwordServiceFactory* HotwordServiceFactory::GetInstance() {
- return Singleton<HotwordServiceFactory>::get();
+ return base::Singleton<HotwordServiceFactory>::get();
}
// static
diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h
index 3489296..31139bd 100644
--- a/chrome/browser/search/hotword_service_factory.h
+++ b/chrome/browser/search/hotword_service_factory.h
@@ -41,7 +41,7 @@ class HotwordServiceFactory : public BrowserContextKeyedServiceFactory {
void UpdateMicrophoneState();
private:
- friend struct DefaultSingletonTraits<HotwordServiceFactory>;
+ friend struct base::DefaultSingletonTraits<HotwordServiceFactory>;
HotwordServiceFactory();
~HotwordServiceFactory() override;
diff --git a/chrome/browser/search/instant_service_factory.cc b/chrome/browser/search/instant_service_factory.cc
index fc2160b..efd98a9 100644
--- a/chrome/browser/search/instant_service_factory.cc
+++ b/chrome/browser/search/instant_service_factory.cc
@@ -24,7 +24,7 @@ InstantService* InstantServiceFactory::GetForProfile(Profile* profile) {
// static
InstantServiceFactory* InstantServiceFactory::GetInstance() {
- return Singleton<InstantServiceFactory>::get();
+ return base::Singleton<InstantServiceFactory>::get();
}
InstantServiceFactory::InstantServiceFactory()
diff --git a/chrome/browser/search/instant_service_factory.h b/chrome/browser/search/instant_service_factory.h
index 223515f..747b879 100644
--- a/chrome/browser/search/instant_service_factory.h
+++ b/chrome/browser/search/instant_service_factory.h
@@ -22,7 +22,7 @@ class InstantServiceFactory : public BrowserContextKeyedServiceFactory {
static InstantServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<InstantServiceFactory>;
+ friend struct base::DefaultSingletonTraits<InstantServiceFactory>;
InstantServiceFactory();
~InstantServiceFactory() override;
diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc
index 77002ad..cabf342 100644
--- a/chrome/browser/search/suggestions/suggestions_service_factory.cc
+++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc
@@ -34,7 +34,7 @@ SuggestionsService* SuggestionsServiceFactory::GetForProfile(Profile* profile) {
// static
SuggestionsServiceFactory* SuggestionsServiceFactory::GetInstance() {
- return Singleton<SuggestionsServiceFactory>::get();
+ return base::Singleton<SuggestionsServiceFactory>::get();
}
SuggestionsServiceFactory::SuggestionsServiceFactory()
diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.h b/chrome/browser/search/suggestions/suggestions_service_factory.h
index 63a6dc3..7066d5f 100644
--- a/chrome/browser/search/suggestions/suggestions_service_factory.h
+++ b/chrome/browser/search/suggestions/suggestions_service_factory.h
@@ -24,7 +24,7 @@ class SuggestionsServiceFactory : public BrowserContextKeyedServiceFactory {
static SuggestionsServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<SuggestionsServiceFactory>;
+ friend struct base::DefaultSingletonTraits<SuggestionsServiceFactory>;
SuggestionsServiceFactory();
~SuggestionsServiceFactory() override;