[iOS] Remove dependencies on //jingle from //components/invalidation/impl.

components/invalidation/impl/BUILD.gn

Index: components/invalidation/impl/BUILD.gn
diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn
index bbbd4f296059b10165cc5a5144b60f54f5c66e81..25175ffa1d10cee8959877bc913244c513398f1d 100644
--- a/components/invalidation/impl/BUILD.gn
+++ b/components/invalidation/impl/BUILD.gn
@@ -13,8 +13,6 @@ source_set("impl") {
     "invalidation_logger_observer.h",
     "invalidation_prefs.cc",
     "invalidation_prefs.h",
-    "invalidation_service_util.cc",
-    "invalidation_service_util.h",
     "invalidation_state_tracker.cc",
     "invalidation_state_tracker.h",
     "invalidation_switches.cc",
@@ -46,13 +44,20 @@ source_set("impl") {
     "//components/prefs",
     "//components/signin/core/browser",
     "//google_apis",
-    "//jingle:notifier",
     "//net:net",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
   ]
 
+  if (!is_ios) {
+    sources += [
+      "invalidation_service_util.cc",
+      "invalidation_service_util.h",
+    ]
+    deps += [ "//jingle:notifier" ]
+  }
+
   if (!is_android) {
     sources += [
       "gcm_invalidation_bridge.cc",
@@ -60,23 +65,9 @@ source_set("impl") {
       "gcm_network_channel.cc",
       "gcm_network_channel.h",
       "gcm_network_channel_delegate.h",
-      "invalidation_notifier.cc",
-      "invalidation_notifier.h",
-      "non_blocking_invalidator.cc",
-      "non_blocking_invalidator.h",
-      "notifier_reason_util.cc",
-      "notifier_reason_util.h",
-      "p2p_invalidator.cc",
-      "p2p_invalidator.h",
-      "push_client_channel.cc",
-      "push_client_channel.h",
       "registration_manager.cc",
       "registration_manager.h",
       "state_writer.h",
-      "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_profile_settings_provider.cc",
@@ -85,9 +76,26 @@ source_set("impl") {
       "ticl_settings_provider.h",
     ]
     deps += [ "//components/gcm_driver/common" ]
-  }
 
-  if (is_android) {
+    if (!is_ios) {
+      sources += [
+        "invalidation_notifier.cc",
+        "invalidation_notifier.h",
+        "non_blocking_invalidator.cc",
+        "non_blocking_invalidator.h",
+        "notifier_reason_util.cc",
+        "notifier_reason_util.h",
+        "p2p_invalidator.cc",
+        "p2p_invalidator.h",
+        "push_client_channel.cc",
+        "push_client_channel.h",
+        "sync_invalidation_listener.cc",
+        "sync_invalidation_listener.h",
+        "sync_system_resources.cc",
+        "sync_system_resources.h",
+      ]
+    }
+  } else {
     sources += [
       "android/component_jni_registrar.cc",
       "android/component_jni_registrar.h",
@@ -121,17 +129,11 @@ source_set("unit_tests") {
       "fake_invalidator_unittest.cc",
       "gcm_invalidation_bridge_unittest.cc",
       "gcm_network_channel_unittest.cc",
-      "invalidation_notifier_unittest.cc",
       "invalidator_registrar_unittest.cc",
       "invalidator_storage_unittest.cc",
-      "non_blocking_invalidator_unittest.cc",
       "object_id_invalidation_map_unittest.cc",
-      "p2p_invalidator_unittest.cc",
-      "push_client_channel_unittest.cc",
       "registration_manager_unittest.cc",
       "single_object_invalidation_set_unittest.cc",
-      "sync_invalidation_listener_unittest.cc",
-      "sync_system_resources_unittest.cc",
       "ticl_invalidation_service_unittest.cc",
       "ticl_profile_settings_provider_unittest.cc",
       "unacked_invalidation_set_unittest.cc",
@@ -143,6 +145,17 @@ source_set("unit_tests") {
       "//google_apis:test_support",
       "//net",
     ]
+
+    if (!is_ios) {
+      sources += [
+        "invalidation_notifier_unittest.cc",
+        "non_blocking_invalidator_unittest.cc",
+        "p2p_invalidator_unittest.cc",
+        "push_client_channel_unittest.cc",
+        "sync_invalidation_listener_unittest.cc",
+        "sync_system_resources_unittest.cc",
+      ]
+    }
   }
 }
 
@@ -171,7 +184,6 @@ static_library("test_support") {
 
   public_deps = [
     ":impl",
-    "//jingle:notifier_test_util",
     "//third_party/cacheinvalidation",
   ]
   deps = [
@@ -181,7 +193,6 @@ static_library("test_support") {
     "//components/signin/core/browser:test_support",
     "//google_apis",
     "//google_apis:test_support",
-    "//jingle:notifier",
     "//net",
     "//testing/gmock",
     "//testing/gtest",
@@ -194,12 +205,17 @@ static_library("test_support") {
 
   if (is_android) {
     deps += [ ":jni_headers" ]
-  } else {
+  } else if (!is_ios) {
     sources += [
       "p2p_invalidation_service.cc",
       "p2p_invalidation_service.h",
     ]
   }
+
+  if (!is_ios) {
+    deps += [ "//jingle:notifier" ]
+    public_deps += [ "//jingle:notifier_test_util" ]
+  }
 }
 
 if (is_android) {