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

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 70b629afe20d696b97bd7e0ad5597a3fceeb6b3e..a42e6ccc5d26e757ee8609af0bec8fdd38b3eca2 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -166,6 +166,7 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/mac/install_from_dmg.h"
 #include "chrome/browser/mac/keystone_glue.h"
+#include "chrome/browser/rlz/rlz.h"

[Roger Tawa OOO till Jul 10th, 2012/03/26 18:52:38]

maybe remove line 153 above and this line and put the #include inside #ifdef
ENABLE_RLZ?

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

Agree.

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

Done.

 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ -1609,8 +1610,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
     ChromeBrowserMainPartsWin::RegisterApplicationRestart(
         parsed_command_line());
   }
+#endif  // OS_WIN
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(ENABLE_RLZ)
   // Init the RLZ library. This just binds the dll and schedules a task on the
   // file thread to be run sometime later. If this is the first run we record
   // the installation event.
@@ -1642,8 +1644,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // for the startup page if needed (i.e., when the startup page is set to
   // the home page).
   RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, NULL);
-#endif  // GOOGLE_CHROME_BUILD
-#endif  // OS_WIN
+#endif  // defined(ENABLE_RLZ)
 
   // Configure modules that need access to resources.
   net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);