Adding unit tests for google_api_keys functionality.

chrome/chrome_tests.gypi

 # 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 941 matching lines @@
         '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'test_support_common',
         '../sync/sync.gyp:test_support_sync',
         '../sync/sync.gyp:test_support_sync_notifier',
         '../sync/sync.gyp:test_support_syncapi_core',
         '../sync/sync.gyp:test_support_syncapi_service',
         'test_support_unit',
         # 3) anything tests directly depend on
+        '../google_apis/google_apis.gyp:google_apis',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../v8/tools/gyp/v8.gyp:v8',
         'common/extensions/api/api.gyp:api',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
-        # TODO(joi): Move these to their own unittest executable?
-        '../google_apis/google_apis.gyp:google_apis',
-        '../google_apis/google_apis.gyp:google_apis_unittests',
       ],
       'include_dirs': [
         '..',
       ],
       # TODO(scr): Use this in browser_tests too.
       'includes': [
         'js_unittest_rules.gypi',
       ],
       'defines': [
         'CLD_WINDOWS',
@@ skipping 1096 matching lines @@
         'test/base/menu_model_test.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
         'test/data/unit/framework_unittest.gtestjs',
         'test/logging/win/mof_data_parser_unittest.cc',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../ash/test/test_launcher_delegate.cc',
         '../ash/test/test_launcher_delegate.h',
         '../ash/test/test_shell_delegate.cc',
+        # TODO(joi): Move the google_apis tests to a separate
+        # google_apis_unittests executable.
+        '../google_apis/google_api_keys_unittest.cc',
+        '../google_apis/gaia/mock_url_fetcher_factory.h',
+        '../google_apis/gaia/gaia_auth_fetcher_unittest.cc',
+        '../google_apis/gaia/gaia_auth_util_unittest.cc',
+        '../google_apis/gaia/gaia_authenticator_unittest.cc',
+        '../google_apis/gaia/gaia_oauth_client_unittest.cc',
+        '../google_apis/gaia/google_service_auth_error_unittest.cc',
+        '../google_apis/gaia/oauth_request_signer_unittest.cc',
+        '../google_apis/gaia/oauth2_access_token_fetcher_unittest.cc',
+        '../google_apis/gaia/oauth2_api_call_flow_unittest.cc',
+        '../google_apis/gaia/oauth2_mint_token_fetcher_unittest.cc',
+        '../google_apis/gaia/oauth2_mint_token_flow_unittest.cc',
+        '../google_apis/gaia/oauth2_revocation_fetcher_unittest.cc',
         '../skia/ext/bitmap_platform_device_mac_unittest.cc',
         '../skia/ext/convolver_unittest.cc',
         '../skia/ext/image_operations_unittest.cc',
         '../skia/ext/platform_canvas_unittest.cc',
         '../skia/ext/skia_utils_mac_unittest.mm',
         '../skia/ext/vector_canvas_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../tools/json_schema_compiler/test/additional_properties_unittest.cc',
         '../tools/json_schema_compiler/test/any_unittest.cc',
@@ skipping 498 matching lines @@
         }],
         ['component=="shared_library" and incremental_chrome_dll!=1', {
           # This is needed for tests that subclass
           # RendererWebKitPlatformSupportImpl, which subclasses stuff in
           # glue, which refers to symbols defined in these files.
           # Hopefully this can be resolved with http://crbug.com/98755.
           'sources': [
             '../content/common/socket_stream_dispatcher.cc',
           ]},
         ],
+        # We don't need the rest of what we do for the google_apis

[MAD, 2012/09/20 15:39:39]

Weird... I find this hard to process when I read this.
Can you rephrase please?

[Jói, 2012/09/20 16:25:12]

This made more sense in the context of google_apis.gyp, where it was in an
earlier version of this patch (that didn't work because none of the unit tests
ran :).  In the context of chrome_tests.gypi it needs no comment except the TODO
comment, so I removed all but that.

+        # target, we just need this to tell
+        # google_api_keys_unittest.cc whether the internal key file is
+        # available.
+        # TODO(joi): Remove from this file once separate
+        # google_apis_unittests target is established.
+        ['use_official_google_api_keys==1', {
+          'defines': ['USE_OFFICIAL_GOOGLE_API_KEYS=1'],
+        }],
       ],
     },
     {
       'target_name': 'chrome_app_unittests',
       'type': 'executable',
       'dependencies': [
         # unit tests should only depend on
         # 1) everything that the chrome binaries depend on:
         '<@(chromium_dependencies)',
         # 2) test-specific support libraries:
@@ skipping 2174 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }