Merge 34534 - Mac: make it even less likely that the renderer+Breakpad leaks ...

chrome/chrome.gyp

 # Copyright (c) 2009 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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 4046 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'renderer',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'app/breakpad_mac_stubs.mm',
         # The only thing used from browser is Browser::Type.
         'browser/browser.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (above).
         #'browser/net/url_request_mock_http_job.cc',
         #'browser/net/url_request_mock_http_job.h',
         'browser/net/url_request_mock_net_error_job.cc',
         'browser/net/url_request_mock_net_error_job.h',
         'browser/renderer_host/mock_render_process_host.cc',
         'browser/renderer_host/mock_render_process_host.h',
@@ skipping 251 matching lines @@
           'sources!': [
             'browser/process_singleton_linux_uitest.cc',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="mac"', {
-          'sources': [
-            'app/breakpad_mac_stubs.mm',
-          ],
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             # leaves an extra window on screen after test completes.
             'browser/sessions/session_restore_uitest.cc',
             # puts up modal dialogs.
             'browser/unload_uitest.cc',
             'test/ui/fast_shutdown_uitest.cc',
@@ skipping 140 matching lines @@
       ],
       'defines': [
         'CLD_WINDOWS',
       ],
       'direct_dependent_settings': {
         'defines': [
           'CLD_WINDOWS',
         ],
       },
       'sources': [
-        'app/breakpad_mac_stubs.mm',
         # All unittests in browser, common, and renderer.
         'browser/app_controller_mac_unittest.mm',
         'browser/autocomplete/autocomplete_edit_view_mac_unittest.mm',
         'browser/autocomplete/autocomplete_unittest.cc',
         'browser/autocomplete/autocomplete_popup_view_mac_unittest.mm',
         'browser/autocomplete/history_contents_provider_unittest.cc',
         'browser/autocomplete/history_url_provider_unittest.cc',
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/autocomplete/search_provider_unittest.cc',
         'browser/back_forward_menu_model_unittest.cc',
@@ skipping 859 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:gtk'
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_unit_tests',
       'type': 'executable',
       'sources': [
-        'app/breakpad_mac_stubs.mm',
         'browser/sync/engine/all_status_unittest.cc',
         'browser/sync/engine/apply_updates_command_unittest.cc',
         'browser/sync/engine/auth_watcher_unittest.cc',
         'browser/sync/engine/net/gaia_authenticator_unittest.cc',
         'browser/sync/engine/syncer_proto_util_unittest.cc',
         'browser/sync/engine/syncer_thread_unittest.cc',
         'browser/sync/engine/syncer_unittest.cc',
         'browser/sync/engine/syncproto_unittest.cc',
         'browser/sync/notifier/listener/talk_mediator_unittest.cc',
         'browser/sync/syncable/syncable_id_unittest.cc',
@@ skipping 1705 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: