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

components/invalidation/BUILD.gn

Index: components/invalidation/BUILD.gn
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn
index 078ad640eefe5aa82c2c7637da937cb75b797f5f..fd6773a505d965b27741597c6254f28a626a8e68 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -81,11 +81,12 @@
 
   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)
@@ -123,7 +124,6 @@
 
   deps = [
     "//base",
-    "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//net",
@@ -133,5 +133,6 @@
     #'../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)
   ]
 }