Refactor AO2TS to make it easier to componentize.

ios/public/provider/chrome/browser/keyed_service_provider.h

 // 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.
 
 #ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_KEYED_SERVICE_PROVIDER_H_
 #define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_KEYED_SERVICE_PROVIDER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 
 enum class ServiceAccessType;
 
 class KeyedServiceBaseFactory;
-class ProfileOAuth2TokenServiceIOS;
+class ProfileOAuth2TokenService;
 class SigninManager;
 
 namespace autofill {
 class AutofillWebDataService;
 class PersonalDataManager;
 }
 
 namespace bookmarks {
 class BookmarkModel;
 }
@@ skipping 27 matching lines @@
   // correct.
   virtual void AssertKeyedFactoriesBuilt() = 0;
 
   // Returns the bookmarks::BookmarkModel factory for dependencies.
   virtual KeyedServiceBaseFactory* GetBookmarkModelFactory() = 0;
 
   // Returns an instance of bookmarks::BookmarkModel tied to |browser_state|.
   virtual bookmarks::BookmarkModel* GetBookmarkModelForBrowserState(
       ChromeBrowserState* browser_state) = 0;
 
-  // Returns the ProfileOAuth2TokenServiceIOS factory for dependencies.
+  // Returns the ProfileOAuth2TokenService factory for dependencies.
   virtual KeyedServiceBaseFactory* GetProfileOAuth2TokenServiceIOSFactory() = 0;

[droger, 2015/06/29 11:55:53]

Can we also rename the functions here (remove IOS):
GetProfileOAuth2TokenServiceFactory()
GetProfileOAuth2TokenServiceForBrowserState()

[gogerald1, 2015/07/01 17:58:41]

Done.

 
-  // Returns an instance of ProfileOAuth2TokenServiceIOS tied to
+  // Returns an instance of ProfileOAuth2TokenService tied to
   // |browser_state|.
-  virtual ProfileOAuth2TokenServiceIOS*
+  virtual ProfileOAuth2TokenService*
   GetProfileOAuth2TokenServiceIOSForBrowserState(
       ChromeBrowserState* browser_state) = 0;
 
   // Returns the SigninManager factory for dependencies.
   virtual KeyedServiceBaseFactory* GetSigninManagerFactory() = 0;
 
   // Returns an instance of SigninManager tied to |browser_state|.
   virtual SigninManager* GetSigninManagerForBrowserState(
       ChromeBrowserState* browser_state) = 0;
 
@@ skipping 29 matching lines @@
       ChromeBrowserState* browser_state,
       ServiceAccessType access_type) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KeyedServiceProvider);
 };
 
 }  // namespace ios
 
 #endif  // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_KEYED_SERVICE_PROVIDER_H_