Massive refactor of the Android invalidation code.

components/invalidation/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.
 
 static_library("invalidation") {
   sources = [
     "ack_handle.cc",
     "ack_handle.h",
     "ack_handler.cc",
     "ack_handler.h",
@@ skipping 57 matching lines @@
       "sync_invalidation_listener.cc",
       "sync_invalidation_listener.h",
       "sync_system_resources.cc",
       "sync_system_resources.h",
       "ticl_invalidation_service.cc",
       "ticl_invalidation_service.h",
       "ticl_settings_provider.cc",
       "ticl_settings_provider.h",
     ]
   }
+  if (is_android) {
+    sources += [
+      "android/component_jni_registrar.cc",
+      "android/component_jni_registrar.h",
+      "invalidation_service_android.cc",

[nyquist, 2014/09/04 09:01:56]

duplicate. remove

[maxbogue, 2014/09/05 16:42:45]

Done.

+      "invalidation_service_android.h",
+      "invalidation_service_android.cc",
+    ]
+    deps += [ ":jni_headers" ]
+  }
 
   deps = [
     "//base",
     "//components/gcm_driver",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/signin/core/browser",
     "//google_apis",
     "//jingle:notifier",
     "//third_party/cacheinvalidation",
@@ skipping 39 matching lines @@
     "//jingle:notifier_test_util",
     "//net",
     "//testing/gmock",
     "//third_party/cacheinvalidation",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 }