Refactor AO2TS to make it easier to componentize.

components/signin.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN version: //components/signin/core/common
       'target_name': 'signin_core_common',
       'type': 'static_library',
@@ skipping 38 matching lines @@
         'signin/core/browser/about_signin_internals.cc',
         'signin/core/browser/about_signin_internals.h',
         'signin/core/browser/account_reconcilor.cc',
         'signin/core/browser/account_reconcilor.h',
         'signin/core/browser/account_tracker_service.cc',
         'signin/core/browser/account_tracker_service.h',
         'signin/core/browser/device_activity_fetcher.cc',
         'signin/core/browser/device_activity_fetcher.h',
         'signin/core/browser/gaia_cookie_manager_service.cc',
         'signin/core/browser/gaia_cookie_manager_service.h',
-        'signin/core/browser/mutable_profile_oauth2_token_service.cc',
-        'signin/core/browser/mutable_profile_oauth2_token_service.h',
         'signin/core/browser/profile_oauth2_token_service.cc',
         'signin/core/browser/profile_oauth2_token_service.h',
         'signin/core/browser/refresh_token_annotation_request.cc',
         'signin/core/browser/refresh_token_annotation_request.h',
         'signin/core/browser/signin_client.h',
         'signin/core/browser/signin_error_controller.cc',
         'signin/core/browser/signin_error_controller.h',
         'signin/core/browser/signin_internals_util.cc',
         'signin/core/browser/signin_internals_util.h',
         'signin/core/browser/signin_manager.cc',
         'signin/core/browser/signin_manager.h',
         'signin/core/browser/signin_manager_base.cc',
         'signin/core/browser/signin_manager_base.h',
         'signin/core/browser/signin_manager_cookie_helper.cc',
         'signin/core/browser/signin_manager_cookie_helper.h',
         'signin/core/browser/signin_metrics.cc',
         'signin/core/browser/signin_metrics.h',
         'signin/core/browser/signin_tracker.cc',
         'signin/core/browser/signin_tracker.h',
         'signin/core/browser/webdata/token_service_table.cc',
         'signin/core/browser/webdata/token_service_table.h',
         'signin/core/browser/webdata/token_web_data.cc',
         'signin/core/browser/webdata/token_web_data.h',
       ],
       'conditions': [
-        ['OS=="android" or OS=="ios"', {
-          'sources!': [
-            # Not used on Android nor iOS.
-            'signin/core/browser/mutable_profile_oauth2_token_service.cc',
-            'signin/core/browser/mutable_profile_oauth2_token_service.h',
-          ],
-        }],
         ['chromeos==1', {
           'sources!': [
             'signin/core/browser/signin_manager.cc',
           ],
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
@@ skipping 29 matching lines @@
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             # Note: file list duplicated in GN build.
             'signin/ios/browser/merge_session_observer_bridge.h',
             'signin/ios/browser/merge_session_observer_bridge.mm',
             'signin/ios/browser/oauth2_token_service_observer_bridge.h',
             'signin/ios/browser/oauth2_token_service_observer_bridge.mm',
-            'signin/ios/browser/profile_oauth2_token_service_ios.h',
-            'signin/ios/browser/profile_oauth2_token_service_ios.mm',
+            'signin/ios/browser/profile_oauth2_token_service_ios_delegate.h',
+            'signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm',
           ],
         },
       ],
     }],
   ],
 }