Made sync code build and pass unit tests on OS X.

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 137 matching lines @@
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
-      ['OS=="win"', {
+      ['OS=="win" or OS=="mac"', {
         # Whether or not browser sync code is built in.
         'chrome_personalization%': 1,
       }, {
         'chrome_personalization%': 0,
       }],  # OS=="win"
       ['target_arch=="ia32"', {
         'nacl_defines': [
           # TODO(gregoryd): consider getting this from NaCl's common.gypi
           'NACL_TARGET_SUBARCH=32',
           'NACL_BUILD_SUBARCH=32',
@@ skipping 29 matching lines @@
         ],
       }],
       ['OS=="win"', {'sources/': [
         ['include', '_(views|win)(_unittest)?\\.cc$'],
         ['include', '/win/'],
         ['include', '/(views|win)_[^/]*\\.cc$'],
       ]}],
       ['OS=="linux" and toolkit_views==1', {'sources/': [
         ['include', '_views\\.cc$'],
       ]}],
-      ['OS=="win" and chrome_personalization==1', {
+      ['(OS=="win" or OS=="mac") and chrome_personalization==1', {
          'defines': ['CHROME_PERSONALIZATION=1'],
       }],  # chrome_personalization==1
     ],
   },
   'targets': [
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
@@ skipping 1819 matching lines @@
         'browser/sync/glue/change_processor.cc',
         'browser/sync/glue/change_processor.h',
         'browser/sync/glue/http_bridge.cc',
         'browser/sync/glue/http_bridge.h',
         'browser/sync/glue/model_associator.cc',
         'browser/sync/glue/model_associator.h',
         'browser/sync/glue/sync_backend_host.cc',
         'browser/sync/glue/sync_backend_host.h',
         'browser/sync/profile_sync_service.cc',
         'browser/sync/profile_sync_service.h',
+        'browser/sync/sync_setup_flow.cc',
+        'browser/sync/sync_setup_flow.h',
+        'browser/sync/sync_setup_wizard.cc',
+        'browser/sync/sync_setup_wizard.h',
         'browser/sync/sync_status_ui_helper.cc',
         'browser/sync/sync_status_ui_helper.h',
         'browser/tab_contents/constrained_window.h',
         'browser/tab_contents/infobar_delegate.cc',
         'browser/tab_contents/infobar_delegate.h',
         'browser/tab_contents/interstitial_page.cc',
         'browser/tab_contents/interstitial_page.h',
         'browser/tab_contents/navigation_controller.cc',
         'browser/tab_contents/navigation_controller.h',
         'browser/tab_contents/navigation_entry.cc',
@@ skipping 229 matching lines @@
         'browser/views/restart_message_box.h',
         'browser/views/sad_tab_view.cc',
         'browser/views/sad_tab_view.h',
         'browser/views/select_profile_dialog.cc',
         'browser/views/select_profile_dialog.h',
         'browser/views/shell_dialogs_win.cc',
         'browser/views/star_toggle.cc',
         'browser/views/star_toggle.h',
         'browser/views/status_bubble_views.cc',
         'browser/views/status_bubble_views.h',
-        'browser/views/sync/sync_setup_flow.cc',
-        'browser/views/sync/sync_setup_flow.h',
-        'browser/views/sync/sync_setup_wizard.cc',
-        'browser/views/sync/sync_setup_wizard.h',
         'browser/views/tab_icon_view.cc',
         'browser/views/tab_icon_view.h',
         'browser/views/tab_contents/tab_contents_container.cc',
         'browser/views/tab_contents/tab_contents_container.h',
         'browser/views/tab_contents/native_tab_contents_container.h',
         'browser/views/tab_contents/native_tab_contents_container_gtk.cc',
         'browser/views/tab_contents/native_tab_contents_container_gtk.h',
         'browser/views/tab_contents/native_tab_contents_container_win.cc',
         'browser/views/tab_contents/native_tab_contents_container_win.h',
         'browser/views/tab_contents/render_view_context_menu_win.cc',
@@ skipping 1604 matching lines @@
         'test/automation/window_proxy.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_linux.cc',
         'test/chrome_process_util_mac.cc',
         'test/chrome_process_util_win.cc',
         'test/perf/mem_usage_linux.cc',
         'test/perf/mem_usage_mac.cc',
         'test/perf/mem_usage_win.cc',
         'test/perf/mem_usage.h',
+        'test/test_browser_window.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
         'test/ui_test_utils.cc',
         'test/ui_test_utils.h',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ skipping 610 matching lines @@
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
         'browser/sessions/session_service_unittest.cc',
         'browser/sessions/tab_restore_service_unittest.cc',
         'browser/shell_integration_unittest.cc',
         'browser/spellcheck_unittest.cc',
         'browser/ssl/ssl_host_state_unittest.cc',
         'browser/sync/glue/bookmark_model_worker_unittest.cc',
         'browser/sync/glue/http_bridge_unittest.cc',
         'browser/sync/profile_sync_service_unittest.cc',
+        'browser/sync/sync_setup_wizard_unittest.cc',
         'browser/tab_contents/navigation_controller_unittest.cc',
         'browser/tab_contents/navigation_entry_unittest.cc',
         'browser/tab_contents/render_view_host_manager_unittest.cc',
         'browser/tab_contents/thumbnail_generator_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
         'browser/tabs/tab_strip_model_unittest.cc',
         'browser/task_manager_unittest.cc',
         'browser/theme_resources_util_unittest.cc',
         'browser/utility_process_host_unittest.cc',
         'browser/views/bookmark_context_menu_test.cc',
         'browser/views/bookmark_editor_view_unittest.cc',
-        'browser/views/sync/sync_setup_wizard_unittest.cc',
         'browser/visitedlink_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/window_sizer_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
         'common/chrome_plugin_unittest.cc',
         'common/common_param_traits_unittest.cc',
         'common/extensions/extension_resource_unittest.cc',
         'common/extensions/extension_unittest.cc',
         'common/extensions/extension_message_bundle_unittest.cc',
@@ skipping 50 matching lines @@
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
           ],
           'sources!': [
+            # TODO(akalin): Figure out why this unittest fails on linux.

[Evan Stade, 2009/10/19 20:09:22]

this is NOT how you disable unittests. Use the DISABLED_ macro.

+            'browser/browser_commands_unittest.cc',
             'browser/views/bookmark_context_menu_test.cc',
             'browser/gtk/options/cookies_view_unittest.cc',
             # Compact Language Detection (cld) is not supported in linux yet.
             '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
         }],
         ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ skipping 102 matching lines @@
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_drag_data_unittest.cc',
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
-            # Need to port browser_with_test_window_test.* first
-            'browser/browser_commands_unittest.cc',
             'browser/browser_unittest.cc',
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/importer/importer_unittest.cc',
             'browser/login_prompt_unittest.cc',
             'browser/printing/print_job_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
             'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
             'browser/views/bookmark_editor_view_unittest.cc',
             'browser/views/find_bar_host_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
-            'browser/views/sync/sync_setup_wizard_unittest.cc',
             'common/chrome_plugin_unittest.cc',
             'common/net/url_util_unittest.cc',
-            'test/browser_with_test_window_test.cc',
-            'test/browser_with_test_window_test.h',
           ],
         }],
         ['chrome_personalization==1', {
           'sources!': [
             'browser/sync/profile_sync_service_unittest.cc',
           ]
         }],
       ],
     },
     {
@@ skipping 1917 matching lines @@
               'dependencies': [
                 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
               ],
               'link_settings': {
                 'libraries': [
                   '-lcrypt32.lib',
                   '-lws2_32.lib',
                   '-lsecur32.lib',
                 ],
               },
+            }, { # else: OS != "win"
+              'sources!': [
+                'browser/sync/util/data_encryption_unittest.cc',
+              ],
             }],
             ['OS=="linux"', {
               'defines': [
                 'POSIX',
               ],
             }],
           ],
         },
         {
           'target_name': 'sync',
@@ skipping 160 matching lines @@
       ],  # targets when chrome_personalization==1
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: