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

chrome/browser/browser_shutdown.cc

 // 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.
 
 #include "chrome/browser/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/upgrade_util_win.h"
+#endif
+
+#if defined(ENABLE_RLZ)
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 93 matching lines @@
   // Check local state for the restart flag so we can restart the session below.
   bool restart_last_session = false;
   if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
     restart_last_session =
         prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
     prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
   }
 
   prefs->CommitPendingWrite();
 
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#if defined(ENABLE_RLZ)
   // Cleanup any statics created by RLZ. Must be done before NotificationService
   // is destroyed.
   RLZTracker::CleanupRlz();
 #endif
 
   return restart_last_session;
 }
 
 void ShutdownPostThreadsStop(bool restart_last_session) {
   // The jank'o'meter requires that the browser process has been destroyed
@@ skipping 145 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
   return g_shutting_down_without_closing_browsers;
 }
 
 void SetShuttingDownWithoutClosingBrowsers(bool without_close) {
   g_shutting_down_without_closing_browsers = without_close;
 }
 
 }  // namespace browser_shutdown