Introduce a layering in the invalidation component as public and impl

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.
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
+static_library("invalidation_base") {
+  sources = [
+    "base/ack_handle.cc",
+    "base/ack_handle.h",
+    "base/ack_handler.cc",
+    "base/ack_handler.h",
+    "base/invalidation.cc",
+    "base/invalidation.h",
+    "base/invalidation_handler.cc",
+    "base/invalidation_handler.h",

[pavely, 2015/06/24 23:45:17]

Could you add base/invalidation_export.h here too?

+    "base/invalidation_service.h",
+    "base/invalidation_util.cc",
+    "base/invalidation_util.h",
+    "base/invalidator_state.cc",
+    "base/invalidator_state.h",
+    "base/object_id_invalidation_map.cc",
+    "base/object_id_invalidation_map.h",
+    "base/single_object_invalidation_set.cc",
+    "base/single_object_invalidation_set.h",
+  ]
+  public_deps = [
+    "//third_party/cacheinvalidation",
+  ]
+  deps = [
+    "//base",
+    # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
+  ]
+}
+
 static_library("invalidation") {
   sources = [
-    "ack_handle.cc",
-    "ack_handle.h",
-    "ack_handler.cc",
-    "ack_handler.h",
-    "invalidation.cc",
-    "invalidation.h",
-    "invalidation_handler.cc",
-    "invalidation_handler.h",
     "invalidation_logger.cc",
     "invalidation_logger.h",
     "invalidation_logger_observer.h",
     "invalidation_prefs.cc",
     "invalidation_prefs.h",
-    "invalidation_service.h",
     "invalidation_service_util.cc",
     "invalidation_service_util.h",
     "invalidation_state_tracker.cc",
     "invalidation_state_tracker.h",
     "invalidation_switches.cc",
     "invalidation_switches.h",
-    "invalidation_util.cc",
-    "invalidation_util.h",
     "invalidator.cc",
     "invalidator.h",
     "invalidator_registrar.cc",
     "invalidator_registrar.h",
-    "invalidator_state.cc",
-    "invalidator_state.h",
     "invalidator_storage.cc",
     "invalidator_storage.h",
     "mock_ack_handler.cc",
     "mock_ack_handler.h",
-    "object_id_invalidation_map.cc",
-    "object_id_invalidation_map.h",
     "profile_invalidation_provider.cc",
     "profile_invalidation_provider.h",
-    "single_object_invalidation_set.cc",
-    "single_object_invalidation_set.h",
     "unacked_invalidation_set.cc",
     "unacked_invalidation_set.h",
   ]
   if (!is_android) {
     sources += [
       "gcm_invalidation_bridge.cc",
       "gcm_invalidation_bridge.h",
       "gcm_network_channel.cc",
       "gcm_network_channel.h",
       "gcm_network_channel_delegate.h",
@@ skipping 13 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",
     ]
   }
-
   public_deps = [
-    "//third_party/cacheinvalidation",
+    ":invalidation_base",
   ]
   deps = [
     "//base",
+    "//base:i18n",
+    "//base:prefs",
     "//components/gcm_driver",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/signin/core/browser",
     "//google_apis",
     "//jingle:notifier",
+    "//net:net",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
-
-    # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 
   if (is_android) {
     sources += [
       "android/component_jni_registrar.cc",
       "android/component_jni_registrar.h",
       "invalidation_service_android.cc",
       "invalidation_service_android.h",
     ]
     deps += [ ":jni_headers" ]
@@ skipping 97 matching lines @@
       "//base:base_java_test_support",
     ]
   }
   generate_jni("jni_headers") {
     sources = [
       "android/java/src/org/chromium/components/invalidation/InvalidationService.java",
     ]
     jni_package = "components/invalidation"
   }
 }