Windows GN component build fixes: gpu, gcm

google_apis/gcm/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.
 
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 component("gcm") {
   sources = [
     "base/mcs_message.cc",
@@ skipping 41 matching lines @@
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//net",
     "//third_party/leveldatabase",
     "//url",
   ]
 }
 
 proto_library("proto") {
-  visibility = [ ":*" ]
+  # This is part of the gcm component.
+  visibility = [ ":gcm" ]
   sources = [
     "protocol/android_checkin.proto",
     "protocol/checkin.proto",
     "protocol/mcs.proto",
   ]
 
   cc_generator_options = "dllexport_decl=GCM_EXPORT:"
   cc_include = "google_apis/gcm/base/gcm_export.h"
   defines = [ "GCM_IMPLEMENTATION" ]
 }
 
-static_library("test_support") {
+source_set("test_support") {
   testonly = true
   sources = [
     "base/fake_encryptor.cc",
     "base/fake_encryptor.h",
     "engine/fake_connection_factory.cc",
     "engine/fake_connection_factory.h",
     "engine/fake_connection_handler.cc",
     "engine/fake_connection_handler.h",
     "monitoring/fake_gcm_stats_recorder.cc",
     "monitoring/fake_gcm_stats_recorder.h",
@@ skipping 11 matching lines @@
 
 # A standalone MCS (mobile connection server) client.
 executable("mcs_probe") {
   testonly = true
   sources = [
     "tools/mcs_probe.cc",
   ]
 
   deps = [
     ":gcm",
-    ":proto",
     ":test_support",
     "//base",
     "//net",
     "//net:test_support",
+    "//third_party/protobuf:protobuf_lite",
   ]
 }
 
 test("gcm_unit_tests") {
   sources = [
     "base/mcs_message_unittest.cc",
     "base/mcs_util_unittest.cc",
     "base/socket_stream_unittest.cc",
     "engine/account_mapping_unittest.cc",
     "engine/checkin_request_unittest.cc",
     "engine/connection_factory_impl_unittest.cc",
     "engine/connection_handler_impl_unittest.cc",
     "engine/gcm_store_impl_unittest.cc",
     "engine/gservices_settings_unittest.cc",
     "engine/heartbeat_manager_unittest.cc",
     "engine/mcs_client_unittest.cc",
     "engine/registration_request_unittest.cc",
     "engine/unregistration_request_unittest.cc",
   ]
 
   deps = [
-    ":proto",
+    ":gcm",
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//net",
     "//net:test_support",
     "//testing/gtest",
+    "//third_party/protobuf:protobuf_lite",
   ]
 }