Update comments about BrowserContextKeyed_Base_Factory to _Service_.

These comments that say "BrowserContextKeyed_Base_Factory" are outdated
and should refer to "BrowserContextKeyed_Service_Factory" instead.

Bug: 937770
Change-Id: Ie810020033d7337481649b5b3c87bcc1d365eea3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574420Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654875}

chrome/browser/background_sync/background_sync_controller_factory.h

@@ -24,7 +24,7 @@ class BackgroundSyncControllerFactory
   BackgroundSyncControllerFactory();
   ~BackgroundSyncControllerFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/chromeos/extensions/file_manager/event_router_factory.h

@@ -24,7 +24,7 @@ class EventRouterFactory : public BrowserContextKeyedServiceFactory {
   static EventRouterFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h

@@ -30,7 +30,7 @@ class UsersPrivateDelegateFactory : public BrowserContextKeyedServiceFactory {
   UsersPrivateDelegateFactory();
   ~UsersPrivateDelegateFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
 

chrome/browser/chromeos/file_manager/volume_manager_factory.h

@@ -30,13 +30,11 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory {
   static VolumeManagerFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;
   bool ServiceIsNULLWhileTesting() const override;
-
-  // BrowserContextKeyedServiceFactory overrides:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

@@ -55,10 +55,8 @@ class OwnerSettingsServiceChromeOSFactory
 
   static KeyedService* BuildInstanceFor(content::BrowserContext* context);
 
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   bool ServiceIsCreatedWithBrowserContext() const override;
-
-  // BrowserContextKeyedServiceFactory implementation:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* browser_context) const override;
 

chrome/browser/content_settings/cookie_settings_factory.h

@@ -35,7 +35,7 @@ class CookieSettingsFactory
   CookieSettingsFactory();
   ~CookieSettingsFactory() override;
 
-  // |BrowserContextKeyedBaseFactory| methods:
+  // |RefcountedBrowserContextKeyedServiceFactory| methods:
   void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h

@@ -28,7 +28,7 @@ class AutofillPrivateEventRouterFactory
   static AutofillPrivateEventRouterFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h

@@ -29,7 +29,7 @@ class LanguageSettingsPrivateDelegateFactory
   static LanguageSettingsPrivateDelegateFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h

@@ -32,7 +32,7 @@ class PasswordsPrivateDelegateFactory
   PasswordsPrivateDelegateFactory();
   ~PasswordsPrivateDelegateFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h

@@ -28,7 +28,7 @@ class PasswordsPrivateEventRouterFactory
   static PasswordsPrivateEventRouterFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_factory.h

@@ -28,7 +28,7 @@ class SafeBrowsingPrivateEventRouterFactory
   static SafeBrowsingPrivateEventRouterFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/settings_private/generated_prefs_factory.h

@@ -28,7 +28,7 @@ class GeneratedPrefsFactory : public BrowserContextKeyedServiceFactory {
   GeneratedPrefsFactory();
   ~GeneratedPrefsFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
 

chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h

@@ -31,7 +31,7 @@ class SettingsPrivateDelegateFactory
   SettingsPrivateDelegateFactory();
   ~SettingsPrivateDelegateFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h

@@ -28,7 +28,7 @@ class SettingsPrivateEventRouterFactory
   static SettingsPrivateEventRouterFactory* GetInstance();
 
  protected:
-  // BrowserContextKeyedBaseFactory overrides:
+  // BrowserContextKeyedServiceFactory overrides:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h

@@ -26,7 +26,7 @@ class SystemIndicatorManagerFactory : public BrowserContextKeyedServiceFactory {
   SystemIndicatorManagerFactory();
   ~SystemIndicatorManagerFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
 };

chrome/browser/media/media_engagement_service_factory.h

@@ -23,7 +23,7 @@ class MediaEngagementServiceFactory : public BrowserContextKeyedServiceFactory {
   MediaEngagementServiceFactory();
   ~MediaEngagementServiceFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/notifications/metrics/notification_metrics_logger_factory.h

@@ -24,7 +24,7 @@ class NotificationMetricsLoggerFactory
 
   NotificationMetricsLoggerFactory();
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/notifications/notification_display_service_factory.h

@@ -23,7 +23,7 @@ class NotificationDisplayServiceFactory
 
   NotificationDisplayServiceFactory();
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/notifications/notifier_state_tracker_factory.h

@@ -23,7 +23,7 @@ class NotifierStateTrackerFactory : public BrowserContextKeyedServiceFactory {
   NotifierStateTrackerFactory();
   ~NotifierStateTrackerFactory() override;
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/notifications/platform_notification_service_factory.h

@@ -24,7 +24,7 @@ class PlatformNotificationServiceFactory
 
   PlatformNotificationServiceFactory();
 
-  // BrowserContextKeyedBaseFactory implementation.
+  // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/password_manager/password_manager_internals_service_unittest.cc

@@ -68,8 +68,8 @@ TEST_F(PasswordManagerInternalsServiceTest, ServiceNotActiveIncognito) {
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(
           incognito_profile);
-  // BrowserContextKeyedBaseFactory::GetBrowserContextToUse should return NULL
-  // for |profile|, because |profile| is incognito. Therefore the returned
+  // BrowserContextKeyedServiceFactory::GetBrowserContextToUse should return
+  // NULL for |profile|, because |profile| is incognito. Therefore the returned
   // |service| should also be NULL.
   EXPECT_FALSE(service);
 }

chrome/browser/permissions/permission_manager_factory.h

@@ -27,7 +27,7 @@ class PermissionManagerFactory : public BrowserContextKeyedServiceFactory {
   PermissionManagerFactory();
   ~PermissionManagerFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/plugins/flash_temporary_permission_tracker_factory.h

@@ -35,8 +35,6 @@ class FlashTemporaryPermissionTrackerFactory
   // RefcountedBrowserContextKeyedServiceFactory methods:
   scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-
-  // BrowserContextKeyedBaseFactory methods:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
 

chrome/browser/profile_resetter/triggered_profile_resetter_factory.h

@@ -40,8 +40,6 @@ class TriggeredProfileResetterFactory
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-
-  // BrowserContextKeyedBaseFactory:
   void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
   bool ServiceIsCreatedWithBrowserContext() const override;

chrome/browser/serial/serial_chooser_context_factory.h

@@ -23,7 +23,7 @@ class SerialChooserContextFactory : public BrowserContextKeyedServiceFactory {
   SerialChooserContextFactory();
   ~SerialChooserContextFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h

@@ -29,7 +29,7 @@ class ChromeSSLHostStateDelegateFactory
   ChromeSSLHostStateDelegateFactory();
   ~ChromeSSLHostStateDelegateFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   void RegisterProfilePrefs(

chrome/browser/usb/usb_chooser_context_factory.h

@@ -23,7 +23,7 @@ class UsbChooserContextFactory : public BrowserContextKeyedServiceFactory {
   UsbChooserContextFactory();
   ~UsbChooserContextFactory() override;
 
-  // BrowserContextKeyedBaseFactory methods:
+  // BrowserContextKeyedServiceFactory methods:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(

chrome/browser/web_data_service_factory.h

@@ -72,7 +72,7 @@ class WebDataServiceFactory : public BrowserContextKeyedServiceFactory {
   WebDataServiceFactory();
   ~WebDataServiceFactory() override;
 
-  // |BrowserContextKeyedBaseFactory| methods:
+  // |BrowserContextKeyedServiceFactory| methods:
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   KeyedService* BuildServiceInstanceFor(

components/keyed_service/content/browser_context_dependency_manager.h

@@ -13,8 +13,6 @@
 #include "components/keyed_service/core/dependency_manager.h"
 #include "components/keyed_service/core/keyed_service_export.h"
 
-class BrowserContextKeyedBaseFactory;
-
 namespace base {
 template <typename T>
 class NoDestructor;
@@ -29,7 +27,7 @@ class PrefRegistrySyncable;
 }
 
 // A singleton that listens for context destruction notifications and
-// rebroadcasts them to each BrowserContextKeyedBaseFactory in a safe order
+// rebroadcasts them to each BrowserContextKeyedServiceFactory in a safe order
 // based on the stated dependencies by each service.
 class KEYED_SERVICE_EXPORT BrowserContextDependencyManager
     : public DependencyManager {
@@ -44,14 +42,14 @@ class KEYED_SERVICE_EXPORT BrowserContextDependencyManager
   // Called by each BrowserContext to alert us of its creation. Several
   // services want to be started when a context is created. If you want your
   // KeyedService to be started with the BrowserContext, override
-  // BrowserContextKeyedBaseFactory::ServiceIsCreatedWithBrowserContext() to
+  // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() to
   // return true. This method also registers any service-related preferences
   // for non-incognito profiles.
   void CreateBrowserContextServices(content::BrowserContext* context);
 
   // Similar to CreateBrowserContextServices(), except this is used for creating
   // test BrowserContexts - these contexts will not create services for any
-  // BrowserContextKeyedBaseFactories that return true from
+  // BrowserContextKeyedServiceFactory that returns true from
   // ServiceIsNULLWhileTesting().
   void CreateBrowserContextServicesForTest(content::BrowserContext* context);