Merge duplicate code in invalidation helper.

sync/sync.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Setting these two variables allows other targets to use the
     # sync_proto_sources variable as the list of sync protocol buffer files.
     'sync_proto_sources_dir': 'protocol',
@@ skipping 33 matching lines @@
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'SYNC_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
+        '../components/components.gyp:invalidation_public',

[droger, 2015/09/09 08:29:08]

Can we remove this?

         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
         'attachment_store_proto',
         'sync_proto',
       ],
       'export_dependent_settings': [
         'sync_proto',
       ],
@@ skipping 378 matching lines @@
         'util/get_session_name.cc',
         'util/get_session_name.h',
         'util/get_session_name_ios.h',
         'util/get_session_name_ios.mm',
         'util/get_session_name_linux.cc',
         'util/get_session_name_linux.h',
         'util/get_session_name_mac.h',
         'util/get_session_name_mac.mm',
         'util/get_session_name_win.cc',
         'util/get_session_name_win.h',
+        'util/invalidation_helper.cc',
+        'util/invalidation_helper.h',
         'util/logging.cc',
         'util/logging.h',
         'util/nigori.cc',
         'util/nigori.h',
         'util/time.cc',
         'util/time.h',
       ],
 
       'conditions': [
         ['OS=="linux" and chromeos==1', {
@@ skipping 74 matching lines @@
       },
       'includes': [
         '../build/protoc.gypi'
       ],
       'defines': [
         'SYNC_IMPLEMENTATION'
       ],
     },
   ],
 }