iOS factories for ProfileOAuth2TokenService and AccountTrackerService

ios/chrome/browser/history/web_history_service_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/history/web_history_service_factory.h"
 
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/sync_driver/sync_service.h"
+#include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/public/provider/chrome/browser/keyed_service_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace ios {
 namespace {
 
 // Returns true if the user is signed-in and full history sync is enabled,
 // false otherwise.
 bool IsHistorySyncEnabled(ios::ChromeBrowserState* browser_state) {
@@ skipping 22 matching lines @@
 WebHistoryServiceFactory* WebHistoryServiceFactory::GetInstance() {
   return Singleton<WebHistoryServiceFactory>::get();
 }
 
 WebHistoryServiceFactory::WebHistoryServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "WebHistoryService",
           BrowserStateDependencyManager::GetInstance()) {
   ios::KeyedServiceProvider* provider = ios::GetKeyedServiceProvider();
   DependsOn(provider->GetSyncServiceFactory());
-  DependsOn(provider->GetProfileOAuth2TokenServiceFactory());
+  DependsOn(OAuth2TokenServiceFactory::GetInstance());
   DependsOn(provider->GetSigninManagerFactory());
 }
 
 WebHistoryServiceFactory::~WebHistoryServiceFactory() {
 }
 
 scoped_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
   ios::KeyedServiceProvider* provider = ios::GetKeyedServiceProvider();
   return make_scoped_ptr(new history::WebHistoryService(
-      provider->GetProfileOAuth2TokenServiceForBrowserState(browser_state),
+      OAuth2TokenServiceFactory::GetForBrowserState(browser_state),
       provider->GetSigninManagerForBrowserState(browser_state),
       browser_state->GetRequestContext()));
 }
 
 }  // namespace ios