Implement InstanceIDAndroid using InstanceIDWithSubtype.java

chrome/browser/BUILD.gn

 # 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
@@ skipping 745 matching lines @@
                            ".",
                            "//chrome")
     sources += rebase_path(gypi_values.chrome_browser_offline_pages_sources,
                            ".",
                            "//chrome")
     deps += [
       ":client_discourse_context_proto",
       ":delta_file_proto",
       ":jni_headers",
       "//components/data_usage/android",
+      "//components/gcm_driver/instance_id",

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

Why is this necessary? The deps array defined on line 98 already declares this
dependency for all platforms, and I don't think we remove it anywhere for
Android.

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

Removed

       "//components/precache/content",
       "//components/precache/core",
       "//components/resources:components_resources",
       "//components/service_tab_launcher",
       "//components/toolbar",
       "//components/web_contents_delegate_android",
     ]
   }
 
   if (is_android) {
@@ skipping 552 matching lines @@
         rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
     deps = [
       "//components/google/core/browser",
       "//components/omnibox/browser",
       "//components/rlz",
       "//components/search_engines",
       "//rlz:rlz_lib",
     ]
   }
 }