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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 630a6b75b711b85a7bc19ab43f2a4fea65dfd2c7..a72929773ad6b18e608f1bc2222ef263e7786fc2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4603,13 +4603,22 @@
             },
           ],
         }],
+        ['OS=="win" or OS=="mac"', {

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

Only for official builds, right?

[Nico, 2012/03/26 20:26:57]

No, surprisingly not. Chrome-the-browser only sends rlz pings in official
builds, but rlz is also exposed as an extension api which is active in all
configurations (and which sends pings if any extension uses that api).

+          'dependencies': [
+            '../rlz/rlz.gyp:rlz_lib',

[Mark Mentovai, 2012/03/26 20:30:01]

According to this, RLZ bits are indeed included into the “browser” target on
Windows and Mac. (Formerly Windows-only on line 4612.) This target is present in
every Chrome build, including open-source Chromium.

+          ],
+        }, {  # 'OS!="win" and OS!="mac"
+          'sources/': [
+            # Exclude all of rlz.
+            ['exclude', '^browser/rlz/'],
+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             '../google_update/google_update.gyp:google_update',
-            '../rlz/rlz.gyp:rlz_lib',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
             '../ui/views/views.gyp:views',
@@ -4654,10 +4663,6 @@
             # Exclude parts of password_manager.
             ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
 
-            # Exclude all of rlz.
-            ['exclude', '^browser/rlz/'],
-            ['exclude', '^browser/extensions/extension_rlz_module'],
-
             # Exclude all of views.
             ['exclude', '^browser/ui/views/'],
 
@@ -4692,7 +4697,6 @@
                 # This exclude duplicates the one just above because of the
                 # order of evaluation of the 'sources/' rule above, the
                 # conditions, and this 'sources/' rule.
-                ['exclude', '^browser/extensions/extension_rlz_module'],
                 ['exclude', '^browser/google/google_update.cc'],
                 ['exclude', '^browser/google/google_update.h'],
                 ['exclude', '^browser/platform_util_common_linux.cc'],