Refactor AO2TS to make it easier to componentize.

ios/public/test/test_keyed_service_provider.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/public/test/test_keyed_service_provider.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 69 matching lines @@
 TestKeyedServiceProvider::GetBookmarkModelForBrowserState(
     ChromeBrowserState* browser_state) {
   return nullptr;
 }
 
 KeyedServiceBaseFactory*
 TestKeyedServiceProvider::GetProfileOAuth2TokenServiceIOSFactory() {
   return MissingServiceKeyedServiceFactory::GetInstance();
 }
 
-ProfileOAuth2TokenServiceIOS*
+ProfileOAuth2TokenService*
 TestKeyedServiceProvider::GetProfileOAuth2TokenServiceIOSForBrowserState(
     ChromeBrowserState* browser_state) {
   return nullptr;
 }
 
 KeyedServiceBaseFactory* TestKeyedServiceProvider::GetSigninManagerFactory() {
   return MissingServiceKeyedServiceFactory::GetInstance();
 }
 
 SigninManager* TestKeyedServiceProvider::GetSigninManagerForBrowserState(
@@ skipping 38 matching lines @@
 }
 
 history::HistoryService*
 TestKeyedServiceProvider::GetHistoryServiceForBrowserState(
     ChromeBrowserState* browser_state,
     ServiceAccessType access_type) {
   return nullptr;
 }
 
 }  // namespace ios