Merge duplicate code in invalidation helper.

sync/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.
 
 import("//build/config/features.gni")
 import("//testing/test.gni")
 
 component("sync") {
   public_deps = [
     ":sync_core",
@@ skipping 381 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",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = [
     "//sync/internal_api/attachments/proto",
   ]
   deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//components/invalidation/public",
     "//crypto",
     "//google_apis",
     "//net",
     "//sql",
+    "//third_party/cacheinvalidation",
     "//third_party/leveldatabase",
     "//third_party/zlib",
     "//url",
     "//sync/protocol",
   ]
 
   if (is_android) {
     deps += [ "//sync/android:jni_headers" ]
     sources += [
       "android/model_type_helper.cc",
@@ skipping 412 matching lines @@
       ":fake_server_jni",
       ":sync_core",
       ":test_support_sync_fake_server",
       "//base",
       "//sync/protocol:protocol",
       "//testing/gtest",
       "//url:url",
     ]
   }
 }