Merge duplicate code in invalidation helper.

components/sync_driver/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")
 
 source_set("sync_driver") {
   sources = [
     "about_sync_util.cc",
     "about_sync_util.h",
@@ skipping 31 matching lines @@
     "generic_change_processor.cc",
     "generic_change_processor.h",
     "generic_change_processor_factory.cc",
     "generic_change_processor_factory.h",
     "glue/synced_session.cc",
     "glue/synced_session.h",
     "glue/typed_url_model_associator.cc",
     "glue/typed_url_model_associator.h",
     "invalidation_adapter.cc",
     "invalidation_adapter.h",
-    "invalidation_helper.cc",
-    "invalidation_helper.h",
     "local_device_info_provider.h",
     "model_association_manager.cc",
     "model_association_manager.h",
     "model_associator.h",
     "non_blocking_data_type_controller.cc",
     "non_blocking_data_type_controller.h",
     "non_blocking_data_type_manager.cc",
     "non_blocking_data_type_manager.h",
     "non_ui_data_type_controller.cc",
     "non_ui_data_type_controller.h",
@@ skipping 48 matching lines @@
     "//base",
     "//components/favicon/core",
     "//components/history/core/browser",
     "//components/invalidation/public",
     "//components/os_crypt",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/version_info",
     "//net",
     "//sync",
-    "//third_party/cacheinvalidation",
     "//ui/gfx",
   ]
 
   if (enable_configuration_policy) {
     sources += [
       "sync_policy_handler.cc",
       "sync_policy_handler.h",
     ]
     deps += [
       "//components/policy",
@@ skipping 65 matching lines @@
     "system_encryptor_unittest.cc",
     "tab_node_pool_unittest.cc",
     "ui_data_type_controller_unittest.cc",
   ]
   deps = [
     ":test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }