Revert of components: Fix a couple of the TODO(GYP) todos.

components/invalidation/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.
 
 static_library("invalidation") {
   sources = [
     "ack_handle.cc",
     "ack_handle.h",
     "ack_handler.cc",
     "ack_handler.h",
@@ skipping 63 matching lines @@
       "ticl_settings_provider.cc",
       "ticl_settings_provider.h",
     ]
   }
 
   # TODO(GYP) remove this when libjingle is added.
   configs += [ "//content:libjingle_stub_config" ]
 
   deps = [
     "//base",
-    "//components/gcm_driver",
+    #"//components/gcm_driver",  TODO(GYP)
+    "//google_apis",
     "//components/keyed_service/core",
+    "//components/signin/core/browser:browser",
     "//components/pref_registry",
-    "//components/signin/core/browser",
-    "//google_apis",
+    #"//components/signin/core/browser",  TODO(GYP)
     "//sync",
     "//third_party/cacheinvalidation",
     #'../jingle/jingle.gyp:notifier',  TODO(GYP)
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 }
 
 static_library("test_support") {
@@ skipping 17 matching lines @@
   ]
   if (!is_android) {
     sources += [
       "p2p_invalidation_service.cc",
       "p2p_invalidation_service.h",
     ]
   }
 
   deps = [
     "//base",
-    "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//net",
     "//sync",
     "//testing/gmock",
     "//third_party/cacheinvalidation",
     #'../jingle/jingle.gyp:notifier',  TODO(GYP)
     #'../jingle/jingle.gyp:notifier_test_util',  TODO(GYP)
     #'../sync/sync.gyp:test_support_sync_notifier',  TODO(GYP)
+    #'gcm_driver_test_support',  TODO(GYP)
   ]
 }