Implement InstanceIDAndroid using InstanceIDWithSubtype.java

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 3732 matching lines @@
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
           'sources': [
             '<@(chrome_browser_android_sources)',
            ],
           'conditions': [
             ['android_java_ui==1', {
               'dependencies': [
                 '../components/components.gyp:data_usage_android',
+                '../components/components.gyp:instance_id',

[Peter Beverloo, 2016/04/11 14:05:31]

dito

[johnme, 2016/04/13 11:42:12]

Removed

                 '../components/components.gyp:offline_pages',
                 '../components/components.gyp:precache_content',
                 '../components/components.gyp:precache_core',
                 '../components/components.gyp:security_state',
                 '../components/components.gyp:service_tab_launcher',
                 '../components/components.gyp:toolbar',
                 '../components/components.gyp:web_contents_delegate_android',
                 'chrome_browser_jni_headers',
                 'client_discourse_context_proto',
                 'delta_file_proto',
@@ skipping 437 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }