Introduce a layering in the invalidation component as public and impl

components/invalidation.gypi

Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 35fc77a61f80972f36013ad06c3800113789e0e4..ef0f65f96e649af41d386821cfc8b29911aa5eab 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -5,68 +5,87 @@
 {
   'targets': [
     {
+      # GN version: //components/invalidation_base
+      'target_name': 'invalidation_base',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        # TODO(akalin): Remove this (http://crbug.com/133352).
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+      ],
+      'export_dependent_settings': [
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        # Note: sources list duplicated in GN build.
+        'invalidation/base/ack_handle.cc',
+        'invalidation/base/ack_handle.h',
+        'invalidation/base/ack_handler.cc',
+        'invalidation/base/ack_handler.h',
+        'invalidation/base/invalidation.cc',
+        'invalidation/base/invalidation.h',
+        'invalidation/base/invalidation_handler.cc',

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

Could you add invalidation/base/invalidation_export.h here? For some reason it
was not mentioned in this file.

+        'invalidation/base/invalidation_handler.h',
+        'invalidation/base/invalidation_service.h',
+        'invalidation/base/invalidation_util.cc',
+        'invalidation/base/invalidation_util.h',
+        'invalidation/base/invalidator_state.cc',
+        'invalidation/base/invalidator_state.h',
+        'invalidation/base/object_id_invalidation_map.cc',
+        'invalidation/base/object_id_invalidation_map.h',
+        'invalidation/base/single_object_invalidation_set.cc',
+        'invalidation/base/single_object_invalidation_set.h',
+      ],
+    },
+    {
       # GN version: //components/invalidation
       'target_name': 'invalidation',
       'type': 'static_library',
       'dependencies': [
+        'invalidation_base',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_prefs',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-        # TODO(akalin): Remove this (http://crbug.com/133352).
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         'gcm_driver',
         'keyed_service_core',
         'pref_registry',
         'signin_core_browser',
       ],
       'export_dependent_settings': [
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'invalidation_base',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'invalidation/ack_handle.cc',
-        'invalidation/ack_handle.h',
-        'invalidation/ack_handler.cc',
-        'invalidation/ack_handler.h',
-        'invalidation/invalidation.cc',
-        'invalidation/invalidation.h',
-        'invalidation/invalidation_handler.cc',
-        'invalidation/invalidation_handler.h',
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
         'invalidation/invalidation_prefs.cc',
         'invalidation/invalidation_prefs.h',
-        'invalidation/invalidation_service.h',
         'invalidation/invalidation_service_util.cc',
         'invalidation/invalidation_service_util.h',
         'invalidation/invalidation_state_tracker.cc',
         'invalidation/invalidation_state_tracker.h',
         'invalidation/invalidation_switches.cc',
         'invalidation/invalidation_switches.h',
-        'invalidation/invalidation_util.cc',
-        'invalidation/invalidation_util.h',
         'invalidation/invalidator.cc',
         'invalidation/invalidator.h',
         'invalidation/invalidator_registrar.cc',
         'invalidation/invalidator_registrar.h',
-        'invalidation/invalidator_state.cc',
-        'invalidation/invalidator_state.h',
         'invalidation/invalidator_storage.cc',
         'invalidation/invalidator_storage.h',
         'invalidation/mock_ack_handler.cc',
         'invalidation/mock_ack_handler.h',
-        'invalidation/object_id_invalidation_map.cc',
-        'invalidation/object_id_invalidation_map.h',
         'invalidation/profile_invalidation_provider.cc',
         'invalidation/profile_invalidation_provider.h',
-        'invalidation/single_object_invalidation_set.cc',
-        'invalidation/single_object_invalidation_set.h',
         'invalidation/unacked_invalidation_set.cc',
         'invalidation/unacked_invalidation_set.h',
       ],
@@ -115,7 +134,6 @@
         }],
       ],
     },
-
     {
       # GN version: //components/invalidation:test_support
       'target_name': 'invalidation_test_support',