Windows GN component build fixes: gpu, gcm

TBR=dpranke@chromium.org
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

Review URL: https://codereview.chromium.org/1051763008

Cr-Commit-Position: refs/heads/master@{#326918}

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",
   ]
 }

gpu/BUILD.gn

@@ -58,8 +58,6 @@ source_set("test_support") {
     "command_buffer/service/gles2_cmd_decoder_mock.cc",
   ]
 
-  configs += [ ":gpu_implementation" ]
-
   public_deps = [
     ":gpu",
     "//gpu/command_buffer/client:gles2_interface",