summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/google')
-rw-r--r--chrome/browser/google/google_search_counter.cc2
-rw-r--r--chrome/browser/google/google_search_counter.h2
-rw-r--r--chrome/browser/google/google_url_tracker_factory.cc2
-rw-r--r--chrome/browser/google/google_url_tracker_factory.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/google/google_search_counter.cc b/chrome/browser/google/google_search_counter.cc
index 9f4cced..46392fd 100644
--- a/chrome/browser/google/google_search_counter.cc
+++ b/chrome/browser/google/google_search_counter.cc
@@ -19,7 +19,7 @@ void GoogleSearchCounter::RegisterForNotifications() {
// static
GoogleSearchCounter* GoogleSearchCounter::GetInstance() {
- return Singleton<GoogleSearchCounter>::get();
+ return base::Singleton<GoogleSearchCounter>::get();
}
GoogleSearchMetrics::AccessPoint
diff --git a/chrome/browser/google/google_search_counter.h b/chrome/browser/google/google_search_counter.h
index e1f558d..ed6f244 100644
--- a/chrome/browser/google/google_search_counter.h
+++ b/chrome/browser/google/google_search_counter.h
@@ -41,7 +41,7 @@ class GoogleSearchCounter : content::NotificationObserver {
}
private:
- friend struct DefaultSingletonTraits<GoogleSearchCounter>;
+ friend struct base::DefaultSingletonTraits<GoogleSearchCounter>;
friend class GoogleSearchCounterTest;
friend class GoogleSearchCounterAndroidTest;
diff --git a/chrome/browser/google/google_url_tracker_factory.cc b/chrome/browser/google/google_url_tracker_factory.cc
index 7830d54..ba05633 100644
--- a/chrome/browser/google/google_url_tracker_factory.cc
+++ b/chrome/browser/google/google_url_tracker_factory.cc
@@ -20,7 +20,7 @@ GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) {
// static
GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() {
- return Singleton<GoogleURLTrackerFactory>::get();
+ return base::Singleton<GoogleURLTrackerFactory>::get();
}
GoogleURLTrackerFactory::GoogleURLTrackerFactory()
diff --git a/chrome/browser/google/google_url_tracker_factory.h b/chrome/browser/google/google_url_tracker_factory.h
index cf0036f..9d999c6 100644
--- a/chrome/browser/google/google_url_tracker_factory.h
+++ b/chrome/browser/google/google_url_tracker_factory.h
@@ -22,7 +22,7 @@ class GoogleURLTrackerFactory : public BrowserContextKeyedServiceFactory {
static GoogleURLTrackerFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<GoogleURLTrackerFactory>;
+ friend struct base::DefaultSingletonTraits<GoogleURLTrackerFactory>;
GoogleURLTrackerFactory();
~GoogleURLTrackerFactory() override;