[Tango->FCM] Ios. Use IOSChromeProfileInvalidationProviderFactory for Sync.

Bug: 801985, 894501
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I2c4930a7b157393bbfd8656d85d7475fcbc1b782
Reviewed-on: https://chromium-review.googlesource.com/c/1277656Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599505}

ios/chrome/browser/sync/ios_chrome_sync_client.mm

@@ -29,6 +29,7 @@
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/sync/history_model_worker.h"
 #include "components/history/core/browser/sync/typed_url_sync_bridge.h"
+#include "components/invalidation/impl/invalidation_switches.h"
 #include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/password_manager/core/browser/password_model_worker.h"
@@ -55,6 +56,7 @@
 #include "ios/chrome/browser/favicon/favicon_service_factory.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/invalidation/ios_chrome_deprecated_profile_invalidation_provider_factory.h"
+#include "ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.h"
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
@@ -192,9 +194,15 @@ BookmarkUndoService* IOSChromeSyncClient::GetBookmarkUndoServiceIfExists() {
 
 invalidation::InvalidationService*
 IOSChromeSyncClient::GetInvalidationService() {
-  invalidation::ProfileInvalidationProvider* provider =
-      IOSChromeDeprecatedProfileInvalidationProviderFactory::GetForBrowserState(
-          browser_state_);
+  invalidation::ProfileInvalidationProvider* provider;
+
+  if (base::FeatureList::IsEnabled(invalidation::switches::kFCMInvalidations)) {
+    provider = IOSChromeProfileInvalidationProviderFactory::GetForBrowserState(
+        browser_state_);
+  } else {
+    provider = IOSChromeDeprecatedProfileInvalidationProviderFactory::
+        GetForBrowserState(browser_state_);
+  }
   if (provider)
     return provider->GetInvalidationService();
   return nullptr;

ios/chrome/browser/sync/profile_sync_service_factory.cc

@@ -10,6 +10,7 @@
 #include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "components/browser_sync/profile_sync_service.h"
+#include "components/invalidation/impl/invalidation_switches.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/signin/core/browser/device_id_helper.h"
@@ -25,6 +26,7 @@
 #include "ios/chrome/browser/gcm/ios_chrome_gcm_profile_service_factory.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/invalidation/ios_chrome_deprecated_profile_invalidation_provider_factory.h"
+#include "ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.h"
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
@@ -111,8 +113,12 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
   DependsOn(IdentityManagerFactory::GetInstance());
   DependsOn(IOSChromeGCMProfileServiceFactory::GetInstance());
   DependsOn(IOSChromePasswordStoreFactory::GetInstance());
-  DependsOn(
-      IOSChromeDeprecatedProfileInvalidationProviderFactory::GetInstance());
+  if (base::FeatureList::IsEnabled(invalidation::switches::kFCMInvalidations)) {
+    DependsOn(IOSChromeProfileInvalidationProviderFactory::GetInstance());
+  } else {
+    DependsOn(
+        IOSChromeDeprecatedProfileInvalidationProviderFactory::GetInstance());
+  }
   DependsOn(ModelTypeStoreServiceFactory::GetInstance());
   DependsOn(ReadingListModelFactory::GetInstance());
   DependsOn(SessionSyncServiceFactory::GetInstance());