Revert 170247

chrome/browser/rlz/rlz.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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "chrome/browser/rlz/rlz.h"
 
@@ skipping 29 matching lines @@
 // functions on non-Win platforms.
 static bool GetReferral(string16* referral) {
   return true;
 }
 static bool ClearReferral() {
   return true;
 }
 }  // namespace GoogleUpdateSettings
 #endif
 
-// There is no corresponding header for content/browser/browser_main_runner.cc
-// to export this global but it is used in other places as well (also defined
-// as "extern").
-extern bool g_exited_main_message_loop;
-
 using content::BrowserThread;
 using content::NavigationEntry;
 
 namespace {
 
 bool IsBrandOrganic(const std::string& brand) {
   return brand.empty() || google_util::IsOrganic(brand);
 }
 
 void RecordProductEvents(bool first_run,
@@ skipping 56 matching lines @@
   if (homepage_used || is_google_in_startpages) {
     rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                                 RLZTracker::CHROME_HOME_PAGE,
                                 rlz_lib::FIRST_SEARCH);
   }
 }
 
 bool SendFinancialPing(const std::string& brand,
                        const string16& lang,
                        const string16& referral) {
-  // It's possible for the user to close Chrome just before the time that this
-  // ping is due to go out.  Detect that condition and abort.
-  if (g_exited_main_message_loop)
-    return false;
-
   rlz_lib::AccessPoint points[] = {RLZTracker::CHROME_OMNIBOX,
                                    RLZTracker::CHROME_HOME_PAGE,
                                    rlz_lib::NO_ACCESS_POINT};
   std::string lang_ascii(UTF16ToASCII(lang));
   std::string referral_ascii(UTF16ToASCII(referral));
   return rlz_lib::SendFinancialPing(rlz_lib::CHROME, points, "chrome",
                                     brand.c_str(), referral_ascii.c_str(),
                                     lang_ascii.c_str(), false, true);
 }
 
@@ skipping 362 matching lines @@
       base::Bind(base::IgnoreResult(&RLZTracker::GetAccessPointRlz), point,
                  not_used));
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   GetInstance()->rlz_cache_.clear();
   GetInstance()->registrar_.RemoveAll();
 }