Massive refactor of the Android invalidation code.

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',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'signin/core/common/signin_pref_names.cc',
         'signin/core/common/signin_pref_names.h',
         'signin/core/common/signin_switches.cc',
         'signin/core/common/signin_switches.h',
         'signin/core/common/profile_management_switches.cc',
         'signin/core/common/profile_management_switches.h',
       ],
     },
     {
       # GN version: //components/signin/core/browser
       'target_name': 'signin_core_browser',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/base.gyp:base_prefs',
         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         'keyed_service_core',
         'os_crypt',
         'signin_core_common',
         'webdata_common',
@@ skipping 93 matching lines @@
           'sources': [
             # Note: file list duplicated in GN build.
             'signin/ios/browser/profile_oauth2_token_service_ios.h',
             'signin/ios/browser/profile_oauth2_token_service_ios.mm',
           ],
         },
       ],
     }],
   ],
 }