Refactor AO2TS to make it easier to componentize.

ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc

Index: ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc
diff --git a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc b/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc
index 5a24e25c4bfda4bc1317aa31c9c70899fd01d508..1c77acec30e5b27360245acc1c98216dca6e210c 100644
--- a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc
+++ b/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc
@@ -9,7 +9,7 @@
 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/ios/browser/profile_oauth2_token_service_ios.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
 #include "ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
@@ -38,7 +38,7 @@ BookmarkServerClusterServiceFactory::BookmarkServerClusterServiceFactory()
           "BookmarkServerClusterService",
           BrowserStateDependencyManager::GetInstance()) {
   ios::KeyedServiceProvider* provider = ios::GetKeyedServiceProvider();
-  DependsOn(provider->GetProfileOAuth2TokenServiceIOSFactory());
+  DependsOn(provider->GetProfileOAuth2TokenServiceFactory());
   DependsOn(provider->GetSigninManagerFactory());
   DependsOn(EnhancedBookmarkModelFactory::GetInstance());
   DependsOn(provider->GetSyncServiceFactory());
@@ -57,7 +57,7 @@ BookmarkServerClusterServiceFactory::BuildServiceInstanceFor(
   return make_scoped_ptr(new BookmarkServerClusterService(
       GetApplicationContext()->GetApplicationLocale(),
       browser_state->GetRequestContext(),
-      provider->GetProfileOAuth2TokenServiceIOSForBrowserState(browser_state),
+      provider->GetProfileOAuth2TokenServiceForBrowserState(browser_state),
       provider->GetSigninManagerForBrowserState(browser_state),
       EnhancedBookmarkModelFactory::GetForBrowserState(browser_state),
       provider->GetSyncServiceForBrowserState(browser_state),