rlz: Hook up on mac, switch to chrome's network stack on win.

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 2329 matching lines @@
           'dependencies': [
             'chrome_resources.gyp:packed_extra_resources',
             'chrome_resources.gyp:packed_resources',
             'convert_dict_lib',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
           'sources!': [
             'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
           ],
         }],
+        ['OS!="win" and OS!="mac"', {

[Mark Mentovai, 2012/03/26 19:52:18]

Only for official?

Maybe there should be an enable_rlz GYP variable to make this easy.

[Roger Tawa OOO till Jul 10th, 2012/03/26 19:57:14]

I would rather leave it as Nico has it here so that unit tests will run on all
builds, like the trybots.  Unless those machines also do official builds.

+          'sources!': [
+            'browser/rlz/rlz_unittest.cc',
+          ],
+        }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_version_resources',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
@@ skipping 41 matching lines @@
                   'LinkIncremental': '1',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
             'browser/bookmarks/bookmark_node_data_unittest.cc',
-            'browser/rlz/rlz_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
             'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
             'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
             'browser/ui/views/first_run_search_engine_view_unittest.cc',
             'browser/ui/views/generic_info_view_unittest.cc',
             'test/data/resource.rc',
           ],
         }],
         ['OS=="android"', {
           'sources!': [
@@ skipping 643 matching lines @@
             'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/ui/gtk/view_id_util_browsertest.cc',
           ],
         }],
         ['OS=="linux"', {
           'sources!': [
             '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
             '../content/browser/accessibility/dump_accessibility_tree_helper.cc',
           ],
         }],
+        ['OS!="win" and OS!="mac"', {
+          'sources!': [
+            'browser/rlz/rlz_extension_apitest.cc',
+          ],
+        }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
@@ skipping 26 matching lines @@
                 },
               },
             },
           }
         }, { # else: OS != "win"
           'sources!': [
             'app/chrome_command_ids.h',
             'app/chrome_dll.rc',
             'app/chrome_dll_resource.h',
             'app/chrome_version.rc.version',
-            'browser/rlz/rlz_extension_apitest.cc',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             # TODO(estade): port to win/mac.
             'browser/ui/webui/constrained_html_ui_browsertest.cc',
@@ skipping 1462 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }