roll up of misc. gn work

google_apis/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("//build/config/features.gni")
 import("//testing/test.gni")
 
 declare_args() {
   # You can set the variable 'use_official_google_api_keys' to true
   # to use the Google-internal file containing official API keys
@@ skipping 179 matching lines @@
     sources += [
       "drive/dummy_auth_service.cc",
       "drive/dummy_auth_service.h",
       "drive/test_util.cc",
       "drive/test_util.h",
     ]
   }
 }
 
 if (!is_win || link_chrome_on_windows) {
-  test("google_apis_unittest") {
+  test("google_apis_unittests") {
     sources = [
       "google_api_keys_unittest.cc",
       "gaia/gaia_auth_fetcher_unittest.cc",
       "gaia/gaia_auth_util_unittest.cc",
       "gaia/gaia_oauth_client_unittest.cc",
       "gaia/google_service_auth_error_unittest.cc",
       "gaia/merge_session_helper_unittest.cc",
       "gaia/oauth_request_signer_unittest.cc",
       "gaia/oauth2_access_token_fetcher_impl_unittest.cc",
       "gaia/oauth2_api_call_flow_unittest.cc",
@@ skipping 20 matching lines @@
         "drive/drive_api_parser_unittest.cc",
         "drive/drive_api_requests_unittest.cc",
         "drive/drive_api_url_generator_unittest.cc",
         "drive/request_sender_unittest.cc",
         "drive/request_util_unittest.cc",
         "drive/time_util_unittest.cc",
       ]
     }
   }
 }