Windows GN component build fixes: gpu, gcm

google_apis/gcm/BUILD.gn

Index: google_apis/gcm/BUILD.gn
diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn
index ff96ea8d68ff77cf9963d6851956d14005c3a80e..83aa0672deccc985f668e18fa2c004f25a784fc0 100644
--- a/google_apis/gcm/BUILD.gn
+++ b/google_apis/gcm/BUILD.gn
@@ -59,7 +59,8 @@ component("gcm") {
 }
 
 proto_library("proto") {
-  visibility = [ ":*" ]
+  # This is part of the gcm component.
+  visibility = [ ":gcm" ]
   sources = [
     "protocol/android_checkin.proto",
     "protocol/checkin.proto",
@@ -71,7 +72,7 @@ proto_library("proto") {
   defines = [ "GCM_IMPLEMENTATION" ]
 }
 
-static_library("test_support") {
+source_set("test_support") {
   testonly = true
   sources = [
     "base/fake_encryptor.cc",
@@ -103,11 +104,11 @@ executable("mcs_probe") {
 
   deps = [
     ":gcm",
-    ":proto",
     ":test_support",
     "//base",
     "//net",
     "//net:test_support",
+    "//third_party/protobuf:protobuf_lite",
   ]
 }
 
@@ -129,12 +130,13 @@ test("gcm_unit_tests") {
   ]
 
   deps = [
-    ":proto",
+    ":gcm",
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//net",
     "//net:test_support",
     "//testing/gtest",
+    "//third_party/protobuf:protobuf_lite",
   ]
 }