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 c58d8d1dee7714baa1f2a17044b1450647deb4a2..1476b479e0e92d4d201340b4f1a864ba1433e684 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -81,12 +81,11 @@ static_library("invalidation") {
 
   deps = [
     "//base",
-    #"//components/gcm_driver",  TODO(GYP)
-    "//google_apis",
+    "//components/gcm_driver",
     "//components/keyed_service/core",
-    "//components/signin/core/browser:browser",
     "//components/pref_registry",
-    #"//components/signin/core/browser",  TODO(GYP)
+    "//components/signin/core/browser",
+    "//google_apis",
     "//jingle:notifier",
     "//sync",
     "//third_party/cacheinvalidation",
@@ -124,6 +123,7 @@ static_library("test_support") {
 
   deps = [
     "//base",
+    "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//jingle:notifier",
@@ -132,6 +132,5 @@ static_library("test_support") {
     "//sync",
     "//testing/gmock",
     "//third_party/cacheinvalidation",
-    #'gcm_driver_test_support',  TODO(GYP)
   ]
 }