Cleaning up TODOs in //google_apis.

google_apis/google_apis.gyp

Index: google_apis/google_apis.gyp
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp
index 02a12758b7c5e23e1f8e4aaa8cd534d59be5b044..c67232ffb5fd3cb1809cc27f3690aedeb1036a42 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -25,27 +25,14 @@
         ['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"', {