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

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 264 matching lines @@
       'build_for_tool%': '',
 
       # Whether tests targets should be run, archived or just have the
       # dependencies verified. All the tests targets have the '_run' suffix,
       # e.g. base_unittests_run runs the target base_unittests. The test target
       # always calls tools/isolate/isolate.py. See the script's --help for more
       # information and the valid --mode values. Meant to be overriden with
       # GYP_DEFINES.
       'tests_run%': 'check',
 
+       # Force rlz to use chrome's networking stack.
+      'force_rlz_use_chrome_net%': 1,
+
       'conditions': [
         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
         # the 'conditions' clause.  Initial attempts resulted in chromium and
         # webkit disagreeing on its setting.
         ['OS=="mac"', {
           'use_skia%': 1,
           # Mac uses clang by default, so turn on the plugin as well.
           'clang_use_chrome_plugins%': 1,
         }, {
           'use_skia%': 1,
@@ skipping 198 matching lines @@
     'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
     'enable_web_intents%': '<(enable_web_intents)',
     'enable_web_intents_tag%': '<(enable_web_intents_tag)',
     'enable_plugin_installation%': '<(enable_plugin_installation)',
     'enable_themes%': '<(enable_themes)',
     'linux_use_gold_binary%': '<(linux_use_gold_binary)',
     'linux_use_gold_flags%': '<(linux_use_gold_flags)',
     'use_canvas_skia%': '<(use_canvas_skia)',
     'tests_run%': '<(tests_run)',
     'enable_automation%': '<(enable_automation)',
+    'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
 
     # Whether to build for Wayland display server
     'use_wayland%': 0,
 
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
 
     # Default to enabled PIE; this is important for ASLR but we may need to be
     # able to turn it off for various reasons.
     'linux_disable_pie%': 0,
@@ skipping 619 matching lines @@
     },
     'conditions': [
       ['OS=="win" and "<(msbuild_toolset)"!=""', {
         'msbuild_toolset': '<(msbuild_toolset)',
       }],
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
+      ['branding=="Chrome" and (OS=="win" or OS=="mac")', {
+        'defines': ['ENABLE_RLZ'],
+      }],
       ['component=="shared_library"', {
         'defines': ['COMPONENT_BUILD'],
       }],
       ['component=="shared_library" and incremental_chrome_dll==1', {
         # TODO(dpranke): We can't incrementally link chrome when
         # content is being built as a DLL because chrome links in
         # webkit_glue and webkit_glue depends on symbols defined in
         # content. We can remove this when we fix glue.
         # See http://code.google.com/p/chromium/issues/detail?id=98755 .
         'defines': ['COMPILE_CONTENT_STATICALLY'],
@@ skipping 1791 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }