Deprecate the factory for creating the Invalidation Service.

Having the deprecated version of the InvalidationServiceProviderFactory will
allow to migrate every sub-project which depends on invalidations individually.

Follow-up CL introduces new factory, which internally will create the invalidation service based on
FCM: https://chromium-review.googlesource.com/c/chromium/src/+/1185093

Bug: 801985

TBR=skuhne@chromium.org, emaxx@chromium.org, fukino@chromium.org, msarda@chromium.org, xiyuan@chromium.org

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I84c64366017de58bdfe060e59b8d54e8d2153a8d
Reviewed-on: https://chromium-review.googlesource.com/1185014
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585870}

chrome/browser/BUILD.gn

@@ -608,8 +608,8 @@ jumbo_split_static_library("browser") {
     "interstitials/enterprise_util.h",
     "intranet_redirect_detector.cc",
     "intranet_redirect_detector.h",
-    "invalidation/profile_invalidation_provider_factory.cc",
-    "invalidation/profile_invalidation_provider_factory.h",
+    "invalidation/deprecated_profile_invalidation_provider_factory.cc",
+    "invalidation/deprecated_profile_invalidation_provider_factory.h",
     "io_thread.cc",
     "io_thread.h",
     "language/chrome_language_detection_tab_helper.cc",

chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_identity_provider.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -151,7 +151,8 @@ void AffiliatedInvalidationServiceProviderImpl::Observe(
   DCHECK(!is_shut_down_);
   Profile* profile = content::Details<Profile>(details).ptr();
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile);
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
+          profile);
   if (!invalidation_provider) {
     // If the Profile does not support invalidation (e.g. guest, incognito),
     // ignore it.

chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc

@@ -15,7 +15,7 @@
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ -210,8 +210,8 @@ void AffiliatedInvalidationServiceProviderImplTest::SetUp() {
   chromeos::DeviceOAuth2TokenServiceFactory::Initialize(
       test_shared_loader_factory_);
 
-  invalidation::ProfileInvalidationProviderFactory::GetInstance()->
-      RegisterTestingFactory(BuildProfileInvalidationProvider);
+  invalidation::DeprecatedProfileInvalidationProviderFactory::GetInstance()
+      ->RegisterTestingFactory(BuildProfileInvalidationProvider);
 
   provider_ = std::make_unique<AffiliatedInvalidationServiceProviderImpl>();
 }
@@ -222,8 +222,8 @@ void AffiliatedInvalidationServiceProviderImplTest::TearDown() {
   provider_.reset();
   test_shared_loader_factory_->Detach();
 
-  invalidation::ProfileInvalidationProviderFactory::GetInstance()->
-      RegisterTestingFactory(nullptr);
+  invalidation::DeprecatedProfileInvalidationProviderFactory::GetInstance()
+      ->RegisterTestingFactory(nullptr);
   chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
   chromeos::SystemSaltGetter::Shutdown();
@@ -340,8 +340,9 @@ AffiliatedInvalidationServiceProviderImplTest::GetProfileInvalidationService(
     Profile* profile, bool create) {
   invalidation::ProfileInvalidationProvider* invalidation_provider =
       static_cast<invalidation::ProfileInvalidationProvider*>(
-          invalidation::ProfileInvalidationProviderFactory::GetInstance()->
-              GetServiceForBrowserContext(profile, create));
+          invalidation::DeprecatedProfileInvalidationProviderFactory::
+              GetInstance()
+                  ->GetServiceForBrowserContext(profile, create));
   if (!invalidation_provider)
     return nullptr;
   return static_cast<invalidation::FakeInvalidationService*>(

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

@@ -29,7 +29,7 @@
 #include "chrome/browser/chromeos/policy/remote_commands/user_commands_factory_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/policy/wildcard_login_checker.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/policy/cloud/remote_commands_invalidator_impl.h"
@@ -97,7 +97,8 @@ class UserCloudPolicyManagerChromeOSNotifierFactory
   UserCloudPolicyManagerChromeOSNotifierFactory()
       : BrowserContextKeyedServiceShutdownNotifierFactory(
             "UserRemoteCommandsInvalidator") {
-    DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
+    DependsOn(invalidation::DeprecatedProfileInvalidationProviderFactory::
+                  GetInstance());
   }
 
   ~UserCloudPolicyManagerChromeOSNotifierFactory() override = default;
@@ -677,7 +678,8 @@ void UserCloudPolicyManagerChromeOS::Observe(
                     content::Source<Profile>(profile_));
 
   invalidation::ProfileInvalidationProvider* const invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
+          profile_);
 
   if (!invalidation_provider)
     return;

chrome/browser/drive/drive_notification_manager_factory.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
 
 #include "base/logging.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/browser_sync/profile_sync_service.h"
@@ -29,8 +29,8 @@ DriveNotificationManagerFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   if (!browser_sync::ProfileSyncService::IsSyncAllowedByFlag())
     return NULL;
-  if (!invalidation::ProfileInvalidationProviderFactory::GetForProfile(
-          Profile::FromBrowserContext(context))) {
+  if (!invalidation::DeprecatedProfileInvalidationProviderFactory::
+          GetForProfile(Profile::FromBrowserContext(context))) {
     // Do not create a DriveNotificationManager for |context|s that do not
     // support invalidation.
     return NULL;
@@ -51,7 +51,8 @@ DriveNotificationManagerFactory::DriveNotificationManagerFactory()
         "DriveNotificationManager",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ProfileSyncServiceFactory::GetInstance());
-  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
+  DependsOn(invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance());
 }
 
 DriveNotificationManagerFactory::~DriveNotificationManagerFactory() {}
@@ -59,7 +60,7 @@ DriveNotificationManagerFactory::~DriveNotificationManagerFactory() {}
 KeyedService* DriveNotificationManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromBrowserContext(context));
   DCHECK(invalidation_provider);
   DCHECK(invalidation_provider->GetInvalidationService());

chrome/browser/invalidation/profile_invalidation_provider_factory.cc → chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 
 #include <memory>
 #include <utility>
@@ -53,8 +53,8 @@
 namespace invalidation {
 
 // static
-ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
-    Profile* profile) {
+ProfileInvalidationProvider*
+DeprecatedProfileInvalidationProviderFactory::GetForProfile(Profile* profile) {
 #if defined(OS_CHROMEOS)
   // Using ProfileHelper::GetSigninProfile() here would lead to an infinite loop
   // when this method is called during the creation of the sign-in profile
@@ -73,15 +73,16 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
 }
 
 // static
-ProfileInvalidationProviderFactory*
-ProfileInvalidationProviderFactory::GetInstance() {
-  return base::Singleton<ProfileInvalidationProviderFactory>::get();
+DeprecatedProfileInvalidationProviderFactory*
+DeprecatedProfileInvalidationProviderFactory::GetInstance() {
+  return base::Singleton<DeprecatedProfileInvalidationProviderFactory>::get();
 }
 
-ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
+DeprecatedProfileInvalidationProviderFactory::
+    DeprecatedProfileInvalidationProviderFactory()
     : BrowserContextKeyedServiceFactory(
-        "InvalidationService",
-        BrowserContextDependencyManager::GetInstance()),
+          "InvalidationService",
+          BrowserContextDependencyManager::GetInstance()),
       testing_factory_(NULL) {
 #if !defined(OS_ANDROID)
   DependsOn(IdentityManagerFactory::GetInstance());
@@ -89,22 +90,23 @@ ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
 #endif
 }
 
-ProfileInvalidationProviderFactory::~ProfileInvalidationProviderFactory() {
-}
+DeprecatedProfileInvalidationProviderFactory::
+    ~DeprecatedProfileInvalidationProviderFactory() {}
 
-void ProfileInvalidationProviderFactory::RegisterTestingFactory(
+void DeprecatedProfileInvalidationProviderFactory::RegisterTestingFactory(
     TestingFactoryFunction testing_factory) {
   testing_factory_ = testing_factory;
 }
 
-KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
+KeyedService*
+DeprecatedProfileInvalidationProviderFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   if (testing_factory_)
     return testing_factory_(context).release();
 
 #if defined(OS_ANDROID)
-  return new ProfileInvalidationProvider(
-      std::unique_ptr<InvalidationService>(new InvalidationServiceAndroid()));
+  auto service = std::make_unique<InvalidationServiceAndroid>();
+  return new ProfileInvalidationProvider(std::move(service));
 #else
 
   std::unique_ptr<IdentityProvider> identity_provider;
@@ -161,7 +163,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
 #endif
 }
 
-void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
+void DeprecatedProfileInvalidationProviderFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   ProfileInvalidationProvider::RegisterProfilePrefs(registry);
   InvalidatorStorage::RegisterProfilePrefs(registry);

chrome/browser/invalidation/profile_invalidation_provider_factory.h → chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
-#define CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
+#ifndef CHROME_BROWSER_INVALIDATION_DEPRECATED_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
+#define CHROME_BROWSER_INVALIDATION_DEPRECATED_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/singleton.h"
@@ -28,7 +28,7 @@ class ProfileInvalidationProvider;
 // may be completely different on different platforms; this class should help to
 // hide this complexity. It also exposes some factory methods that are useful
 // for setting up tests that rely on invalidations.
-class ProfileInvalidationProviderFactory
+class DeprecatedProfileInvalidationProviderFactory
     : public BrowserContextKeyedServiceFactory {
  public:
   // Returns the ProfileInvalidationProvider for the given |profile|, lazily
@@ -36,20 +36,20 @@ class ProfileInvalidationProviderFactory
   // (Chrome OS login profile, Chrome OS guest), returns NULL instead.
   static ProfileInvalidationProvider* GetForProfile(Profile* profile);
 
-  static ProfileInvalidationProviderFactory* GetInstance();
+  static DeprecatedProfileInvalidationProviderFactory* GetInstance();
 
   // Switches service creation to go through |testing_factory| for all browser
   // contexts.
   void RegisterTestingFactory(TestingFactoryFunction testing_factory);
 
  private:
-  friend class ProfileInvalidationProviderFactoryTestBase;
+  friend class DeprecatedProfileInvalidationProviderFactoryTestBase;
   friend class policy::AffiliatedInvalidationServiceProviderImplTest;
   friend struct base::DefaultSingletonTraits<
-      ProfileInvalidationProviderFactory>;
+      DeprecatedProfileInvalidationProviderFactory>;
 
-  ProfileInvalidationProviderFactory();
-  ~ProfileInvalidationProviderFactory() override;
+  DeprecatedProfileInvalidationProviderFactory();
+  ~DeprecatedProfileInvalidationProviderFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
@@ -59,9 +59,9 @@ class ProfileInvalidationProviderFactory
 
   TestingFactoryFunction testing_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactory);
+  DISALLOW_COPY_AND_ASSIGN(DeprecatedProfileInvalidationProviderFactory);
 };
 
 }  // namespace invalidation
 
-#endif  // CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
+#endif  // CHROME_BROWSER_INVALIDATION_DEPRECATED_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_

chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc → chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory_browsertest.cc

@@ -6,7 +6,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -20,91 +20,89 @@
 
 namespace invalidation {
 
-class ProfileInvalidationProviderFactoryTestBase : public InProcessBrowserTest {
+class DeprecatedProfileInvalidationProviderFactoryTestBase
+    : public InProcessBrowserTest {
  protected:
-  ProfileInvalidationProviderFactoryTestBase();
-  ~ProfileInvalidationProviderFactoryTestBase() override;
+  DeprecatedProfileInvalidationProviderFactoryTestBase();
+  ~DeprecatedProfileInvalidationProviderFactoryTestBase() override;
 
   bool CanConstructProfileInvalidationProvider(Profile* profile);
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryTestBase);
+  DISALLOW_COPY_AND_ASSIGN(
+      DeprecatedProfileInvalidationProviderFactoryTestBase);
 };
 
-ProfileInvalidationProviderFactoryTestBase::
-    ProfileInvalidationProviderFactoryTestBase() {
-}
+DeprecatedProfileInvalidationProviderFactoryTestBase::
+    DeprecatedProfileInvalidationProviderFactoryTestBase() {}
 
-ProfileInvalidationProviderFactoryTestBase::
-    ~ProfileInvalidationProviderFactoryTestBase() {
-}
+DeprecatedProfileInvalidationProviderFactoryTestBase::
+    ~DeprecatedProfileInvalidationProviderFactoryTestBase() {}
 
-bool
-ProfileInvalidationProviderFactoryTestBase::
+bool DeprecatedProfileInvalidationProviderFactoryTestBase::
     CanConstructProfileInvalidationProvider(Profile* profile) {
   return static_cast<bool>(
-      ProfileInvalidationProviderFactory::GetInstance()->
-          GetServiceForBrowserContext(profile, false));
+      DeprecatedProfileInvalidationProviderFactory::GetInstance()
+          ->GetServiceForBrowserContext(profile, false));
 }
 
-class ProfileInvalidationProviderFactoryLoginScreenBrowserTest
-    : public ProfileInvalidationProviderFactoryTestBase {
+class DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest
+    : public DeprecatedProfileInvalidationProviderFactoryTestBase {
  protected:
-  ProfileInvalidationProviderFactoryLoginScreenBrowserTest();
-  ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest() override;
+  DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest();
+  ~DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest()
+      override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(
-      ProfileInvalidationProviderFactoryLoginScreenBrowserTest);
+      DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest);
 };
 
-ProfileInvalidationProviderFactoryLoginScreenBrowserTest::
-    ProfileInvalidationProviderFactoryLoginScreenBrowserTest() {
-}
+DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest::
+    DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest() {}
 
-ProfileInvalidationProviderFactoryLoginScreenBrowserTest::
-    ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest() {
-}
+DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest::
+    ~DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest() {}
 
-void ProfileInvalidationProviderFactoryLoginScreenBrowserTest::SetUpCommandLine(
-    base::CommandLine* command_line) {
+void DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest::
+    SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
 }
 
 // Verify that no InvalidationService is instantiated for the login profile on
 // the login screen.
-IN_PROC_BROWSER_TEST_F(ProfileInvalidationProviderFactoryLoginScreenBrowserTest,
-                       NoInvalidationService) {
+IN_PROC_BROWSER_TEST_F(
+    DeprecatedProfileInvalidationProviderFactoryLoginScreenBrowserTest,
+    NoInvalidationService) {
   Profile* login_profile =
       chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
   EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
 }
 
-class ProfileInvalidationProviderFactoryGuestBrowserTest
-    : public ProfileInvalidationProviderFactoryTestBase {
+class DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest
+    : public DeprecatedProfileInvalidationProviderFactoryTestBase {
  protected:
-  ProfileInvalidationProviderFactoryGuestBrowserTest();
-  ~ProfileInvalidationProviderFactoryGuestBrowserTest() override;
+  DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest();
+  ~DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest() override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryGuestBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(
+      DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest);
 };
 
-ProfileInvalidationProviderFactoryGuestBrowserTest::
-    ProfileInvalidationProviderFactoryGuestBrowserTest() {
-}
+DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest::
+    DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest() {}
 
-ProfileInvalidationProviderFactoryGuestBrowserTest::
-    ~ProfileInvalidationProviderFactoryGuestBrowserTest() {
-}
+DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest::
+    ~DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest() {}
 
-void ProfileInvalidationProviderFactoryGuestBrowserTest::SetUpCommandLine(
-    base::CommandLine* command_line) {
+void DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest::
+    SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kGuestSession);
   command_line->AppendSwitch(::switches::kIncognito);
   command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
@@ -115,8 +113,9 @@ void ProfileInvalidationProviderFactoryGuestBrowserTest::SetUpCommandLine(
 
 // Verify that no InvalidationService is instantiated for the login profile or
 // the guest profile while a guest session is in progress.
-IN_PROC_BROWSER_TEST_F(ProfileInvalidationProviderFactoryGuestBrowserTest,
-                       NoInvalidationService) {
+IN_PROC_BROWSER_TEST_F(
+    DeprecatedProfileInvalidationProviderFactoryGuestBrowserTest,
+    NoInvalidationService) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   EXPECT_TRUE(user_manager->IsLoggedInAsGuest());
   Profile* guest_profile =

chrome/browser/invalidation/invalidation_service_factory_android.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
 
 #include "base/android/jni_android.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "components/invalidation/impl/invalidation_service_android.h"
@@ -22,7 +22,7 @@ ScopedJavaLocalRef<jobject> InvalidationServiceFactoryAndroid::GetForProfile(
     const JavaRef<jobject>& j_profile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   invalidation::ProfileInvalidationProvider* provider =
-      ProfileInvalidationProviderFactory::GetForProfile(profile);
+      DeprecatedProfileInvalidationProviderFactory::GetForProfile(profile);
   InvalidationServiceAndroid* service_android =
       static_cast<InvalidationServiceAndroid*>(
           provider->GetInvalidationService());

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

@@ -18,7 +18,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_test_utils.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
@@ -196,8 +196,8 @@ class CloudPolicyTest : public InProcessBrowserTest,
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
 
-    invalidation::ProfileInvalidationProviderFactory::GetInstance()->
-        RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
+    invalidation::DeprecatedProfileInvalidationProviderFactory::GetInstance()
+        ->RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
   }
 
   void SetUpOnMainThread() override {
@@ -300,8 +300,10 @@ class CloudPolicyTest : public InProcessBrowserTest,
   invalidation::FakeInvalidationService* GetInvalidationService() {
     return static_cast<invalidation::FakeInvalidationService*>(
         static_cast<invalidation::ProfileInvalidationProvider*>(
-            invalidation::ProfileInvalidationProviderFactory::GetInstance()->
-                GetForProfile(browser()->profile()))->GetInvalidationService());
+            invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance()
+                    ->GetForProfile(browser()->profile()))
+            ->GetInvalidationService());
   }
 
   void SetServerPolicy(const std::string& policy) {

chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc

@@ -11,7 +11,7 @@
 #include "base/time/default_clock.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_manager.h"
 #include "content/public/browser/notification_source.h"
@@ -65,7 +65,8 @@ void UserCloudPolicyInvalidator::Observe(
   // service can safely be initialized.
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_ADDED, type);
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
+          profile_);
   if (invalidation_provider)
     Initialize(invalidation_provider->GetInvalidationService());
 }

chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h"
 
 #include "build/build_config.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -29,7 +29,8 @@ UserCloudPolicyInvalidatorFactory::UserCloudPolicyInvalidatorFactory()
     : BrowserContextKeyedServiceFactory(
           "UserCloudPolicyInvalidator",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
+  DependsOn(invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance());
 #if defined(OS_CHROMEOS)
   DependsOn(UserPolicyManagerFactoryChromeOS::GetInstance());
 #else

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -32,7 +32,7 @@
 #include "chrome/browser/google/google_search_domain_mixing_metrics_emitter_factory.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/language/language_model_manager_factory.h"
 #include "chrome/browser/language/url_language_histogram_factory.h"
 #include "chrome/browser/media/media_engagement_service.h"
@@ -277,7 +277,7 @@ void ChromeBrowserMainExtraPartsProfiles::
   HistoryServiceFactory::GetInstance();
   HostContentSettingsMapFactory::GetInstance();
   InMemoryURLIndexFactory::GetInstance();
-  invalidation::ProfileInvalidationProviderFactory::GetInstance();
+  invalidation::DeprecatedProfileInvalidationProviderFactory::GetInstance();
 #if !defined(OS_ANDROID)
   InstantServiceFactory::GetInstance();
 #endif

chrome/browser/profiles/profile_manager.cc

@@ -35,7 +35,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/download/download_core_service.h"
 #include "chrome/browser/download/download_core_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ -1350,7 +1350,8 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
 
   GaiaCookieManagerServiceFactory::GetForProfile(profile)->Init();
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile);
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
+          profile);
   // Chrome OS login and guest profiles do not support invalidation. This is
   // fine as they do not have GAIA credentials anyway. http://crbug.com/358169
   invalidation::InvalidationService* invalidation_service =

chrome/browser/signin/account_fetcher_service_factory.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
 
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
@@ -20,7 +20,8 @@ AccountFetcherServiceFactory::AccountFetcherServiceFactory()
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(AccountTrackerServiceFactory::GetInstance());
   DependsOn(ChromeSigninClientFactory::GetInstance());
-  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
+  DependsOn(invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance());
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
 }
 

chrome/browser/sync/chrome_sync_client.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -440,7 +440,8 @@ BookmarkUndoService* ChromeSyncClient::GetBookmarkUndoServiceIfExists() {
 
 invalidation::InvalidationService* ChromeSyncClient::GetInvalidationService() {
   invalidation::ProfileInvalidationProvider* provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
+          profile_);
   if (provider)
     return provider->GetInvalidationService();
   return nullptr;

chrome/browser/sync/profile_sync_service_factory.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -145,7 +145,8 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
 #endif  // !defined(OS_ANDROID)
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(IdentityManagerFactory::GetInstance());
-  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
+  DependsOn(invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance());
   DependsOn(PasswordStoreFactory::GetInstance());
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(SpellcheckServiceFactory::GetInstance());

chrome/browser/sync/test/integration/sync_test.cc

@@ -33,7 +33,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -651,11 +651,12 @@ void SyncTest::InitializeInvalidations(int index) {
     fake_server::FakeServerInvalidationService* invalidation_service =
         static_cast<fake_server::FakeServerInvalidationService*>(
             static_cast<invalidation::ProfileInvalidationProvider*>(
-                invalidation::ProfileInvalidationProviderFactory::
-                    GetInstance()->SetTestingFactoryAndUse(
-                        GetProfile(index),
-                        BuildFakeServerProfileInvalidationProvider))->
-                            GetInvalidationService());
+                invalidation::DeprecatedProfileInvalidationProviderFactory::
+                    GetInstance()
+                        ->SetTestingFactoryAndUse(
+                            GetProfile(index),
+                            BuildFakeServerProfileInvalidationProvider))
+                ->GetInvalidationService());
     fake_server_->AddObserver(invalidation_service);
     if (TestUsesSelfNotifications()) {
       invalidation_service->EnableSelfNotifications();
@@ -666,16 +667,17 @@ void SyncTest::InitializeInvalidations(int index) {
     configuration_refresher_->Observe(
         ProfileSyncServiceFactory::GetForProfile(GetProfile(index)));
   } else {
-    invalidation::P2PInvalidationService* p2p_invalidation_service =
-        static_cast<invalidation::P2PInvalidationService*>(
-            static_cast<invalidation::ProfileInvalidationProvider*>(
-                invalidation::ProfileInvalidationProviderFactory::
-                    GetInstance()->SetTestingFactoryAndUse(
+    invalidation::P2PInvalidationService* p2p_invalidation_service = static_cast<
+        invalidation::P2PInvalidationService*>(
+        static_cast<invalidation::ProfileInvalidationProvider*>(
+            invalidation::DeprecatedProfileInvalidationProviderFactory::
+                GetInstance()
+                    ->SetTestingFactoryAndUse(
                         GetProfile(index),
-                        TestUsesSelfNotifications() ?
-                            BuildSelfNotifyingP2PProfileInvalidationProvider :
-                            BuildRealisticP2PProfileInvalidationProvider))->
-                                GetInvalidationService());
+                        TestUsesSelfNotifications()
+                            ? BuildSelfNotifyingP2PProfileInvalidationProvider
+                            : BuildRealisticP2PProfileInvalidationProvider))
+            ->GetInvalidationService());
     p2p_invalidation_service->UpdateCredentials(username_, password_);
     // Start listening for and emitting notifications of commits.
     DCHECK(!invalidation_forwarders_[index]);

chrome/browser/ui/webui/invalidations_message_handler.cc

@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/invalidation/impl/invalidation_logger.h"
 #include "components/invalidation/impl/profile_invalidation_provider.h"
@@ -44,7 +44,7 @@ void InvalidationsMessageHandler::RegisterMessages() {
 
 void InvalidationsMessageHandler::UIReady(const base::ListValue* args) {
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromWebUI(web_ui()));
   if (invalidation_provider) {
     logger_ = invalidation_provider->GetInvalidationService()->
@@ -58,7 +58,7 @@ void InvalidationsMessageHandler::UIReady(const base::ListValue* args) {
 void InvalidationsMessageHandler::HandleRequestDetailedStatus(
     const base::ListValue* args) {
   invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+      invalidation::DeprecatedProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromWebUI(web_ui()));
   if (invalidation_provider) {
     invalidation_provider->GetInvalidationService()->RequestDetailedStatus(

chrome/test/BUILD.gn

@@ -588,7 +588,7 @@ test("browser_tests") {
       "../browser/installable/installable_manager_browsertest.cc",
       "../browser/interstitials/security_interstitial_page_test_utils.cc",
       "../browser/interstitials/security_interstitial_page_test_utils.h",
-      "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
+      "../browser/invalidation/deprecated_profile_invalidation_provider_factory_browsertest.cc",
       "../browser/io_thread_browsertest.cc",
       "../browser/lifetime/browser_close_manager_browsertest.cc",
       "../browser/lifetime/browser_shutdown_browsertest.cc",
@@ -1853,7 +1853,7 @@ test("browser_tests") {
       }
     } else {  # !is_chromeos
       sources -= [
-        "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
+        "../browser/invalidation/deprecated_profile_invalidation_provider_factory_browsertest.cc",
         "../browser/net/nss_context_chromeos_browsertest.cc",
         "data/webui/certificate_viewer_ui_test-inl.h",
       ]