Clean up InvalidationService test infrastructure.

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'none',
       'dependencies': [ 'browser_real', ],
@@ skipping 958 matching lines @@
         'browser/install_verification/win/module_list.cc',
         'browser/install_verification/win/module_list.h',
         'browser/install_verification/win/module_verification_common.cc',
         'browser/install_verification/win/module_verification_common.h',
         'browser/internal_auth.cc',
         'browser/internal_auth.h',
         'browser/intranet_redirect_detector.cc',
         'browser/intranet_redirect_detector.h',
         'browser/invalidation/invalidation_logger.cc',
         'browser/invalidation/invalidation_logger.h',
-        'browser/invalidation/fake_invalidation_service.cc',
-        'browser/invalidation/fake_invalidation_service.h',
         'browser/invalidation/gcm_invalidation_bridge.cc',
         'browser/invalidation/gcm_invalidation_bridge.h',
         'browser/invalidation/invalidation_controller_android.cc',
         'browser/invalidation/invalidation_controller_android.h',
         'browser/invalidation/invalidation_service.h',
         'browser/invalidation/invalidation_service_android.cc',
         'browser/invalidation/invalidation_service_android.h',
         'browser/invalidation/invalidation_service_factory.cc',
         'browser/invalidation/invalidation_service_factory.h',
         'browser/invalidation/invalidation_service_util.cc',
         'browser/invalidation/invalidation_service_util.h',
         'browser/invalidation/invalidator_storage.cc',
         'browser/invalidation/invalidator_storage.h',
-        'browser/invalidation/p2p_invalidation_service.cc',
-        'browser/invalidation/p2p_invalidation_service.h',
         'browser/invalidation/ticl_invalidation_service.cc',
         'browser/invalidation/ticl_invalidation_service.h',
         'browser/io_thread.cc',
         'browser/io_thread.h',
         'browser/jankometer.cc',
         'browser/jankometer.h',
         'browser/jankometer_android.cc',
         'browser/jankometer_mac.cc',
         'browser/jumplist_updater_win.cc',
         'browser/jumplist_updater_win.h',
@@ skipping 2782 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }