Cleaning up TODOs in //google_apis.

google_apis/google_apis.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
   },
   'includes': [
     '../build/win_precompile.gypi',
   ],
   'targets': [
     {
       'target_name': 'google_apis',
       'type': 'static_library',
       'includes': [
         'determine_use_official_keys.gypi',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
       ],
       'conditions': [
         ['google_api_key!=""', {
           'defines': ['GOOGLE_API_KEY="<(google_api_key)"'],
         }],
-        # Once the default definitions for the various keys in
-        # google_apis/google_api_keys.cc are all made empty, the next
-        # two conditionals can set just GOOGLE_DEFAULT_CLIENT_ID/SECRET.
-        # Until then, we have different semantics on the gyp variables
-        # google_default_client_id/secret and setting the environment
-        # variables of the (upper-case) same name (the latter are used
-        # as the default for unset client IDs/secrets, whereas the
-        # former overrides all client IDs/secrets).
-        # TODO(joi): Fix the above semantic mismatch once possible.
         ['google_default_client_id!=""', {
           'defines': [
-            'GOOGLE_CLIENT_ID_MAIN="<(google_default_client_id)"',
-            'GOOGLE_CLIENT_ID_CLOUD_PRINT="<(google_default_client_id)"',
-            'GOOGLE_CLIENT_ID_REMOTING="<(google_default_client_id)"',
+            'GOOGLE_DEFAULT_CLIENT_ID="<(google_default_client_id)"',
           ]
         }],
         ['google_default_client_secret!=""', {
           'defines': [
-            'GOOGLE_CLIENT_SECRET_MAIN="<(google_default_client_secret)"',
-            'GOOGLE_CLIENT_SECRET_CLOUD_PRINT="<(google_default_client_secret)"',
-            'GOOGLE_CLIENT_SECRET_REMOTING="<(google_default_client_secret)"',
+            'GOOGLE_DEFAULT_CLIENT_SECRET="<(google_default_client_secret)"',
           ]
         }],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources/': [
               ['exclude', 'cup/client_update_protocol_nss\.cc$'],
             ],
         }],
@@ skipping 38 matching lines @@
         'gaia/oauth2_mint_token_flow.cc',
         'gaia/oauth2_mint_token_flow.h',
         'google_api_keys.cc',
         'google_api_keys.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
   ],
 }