diff options
Diffstat (limited to 'chrome/browser/autocomplete')
6 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc index 5bd8e7e..35cab6f 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc @@ -29,7 +29,7 @@ AutocompleteClassifier* AutocompleteClassifierFactory::GetForProfile( // static AutocompleteClassifierFactory* AutocompleteClassifierFactory::GetInstance() { - return Singleton<AutocompleteClassifierFactory>::get(); + return base::Singleton<AutocompleteClassifierFactory>::get(); } // static diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.h b/chrome/browser/autocomplete/autocomplete_classifier_factory.h index bfacf21..1e2f04a 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.h +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.h @@ -26,7 +26,7 @@ class AutocompleteClassifierFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<AutocompleteClassifierFactory>; + friend struct base::DefaultSingletonTraits<AutocompleteClassifierFactory>; AutocompleteClassifierFactory(); ~AutocompleteClassifierFactory() override; diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/chrome/browser/autocomplete/in_memory_url_index_factory.cc index ae2550f..25d3a2a 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_factory.cc +++ b/chrome/browser/autocomplete/in_memory_url_index_factory.cc @@ -25,7 +25,7 @@ InMemoryURLIndex* InMemoryURLIndexFactory::GetForProfile(Profile* profile) { // static InMemoryURLIndexFactory* InMemoryURLIndexFactory::GetInstance() { - return Singleton<InMemoryURLIndexFactory>::get(); + return base::Singleton<InMemoryURLIndexFactory>::get(); } InMemoryURLIndexFactory::InMemoryURLIndexFactory() diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.h b/chrome/browser/autocomplete/in_memory_url_index_factory.h index 4f62a4a..4f925e8 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_factory.h +++ b/chrome/browser/autocomplete/in_memory_url_index_factory.h @@ -7,7 +7,9 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class InMemoryURLIndex; class Profile; @@ -18,7 +20,7 @@ class InMemoryURLIndexFactory : public BrowserContextKeyedServiceFactory { static InMemoryURLIndexFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InMemoryURLIndexFactory>; + friend struct base::DefaultSingletonTraits<InMemoryURLIndexFactory>; InMemoryURLIndexFactory(); ~InMemoryURLIndexFactory() override; diff --git a/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/chrome/browser/autocomplete/shortcuts_backend_factory.cc index 1a3e7ae..cf4b42f 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_factory.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_factory.cc @@ -38,7 +38,7 @@ scoped_refptr<ShortcutsBackend> ShortcutsBackendFactory::GetForProfileIfExists( // static ShortcutsBackendFactory* ShortcutsBackendFactory::GetInstance() { - return Singleton<ShortcutsBackendFactory>::get(); + return base::Singleton<ShortcutsBackendFactory>::get(); } // static diff --git a/chrome/browser/autocomplete/shortcuts_backend_factory.h b/chrome/browser/autocomplete/shortcuts_backend_factory.h index bad596c..8401b49 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_factory.h +++ b/chrome/browser/autocomplete/shortcuts_backend_factory.h @@ -35,7 +35,7 @@ class ShortcutsBackendFactory content::BrowserContext* profile); private: - friend struct DefaultSingletonTraits<ShortcutsBackendFactory>; + friend struct base::DefaultSingletonTraits<ShortcutsBackendFactory>; ShortcutsBackendFactory(); ~ShortcutsBackendFactory() override; |