After a successful ping of the RLZ server, make sure to update the cached

chrome/browser/rlz/rlz.cc

 // Copyright (c) 2011 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 228 matching lines @@
   _beginthread(PingNow, 0, this);
 }
 
 // static
 void _cdecl RLZTracker::PingNow(void* arg) {
   RLZTracker* tracker = reinterpret_cast<RLZTracker*>(arg);
   tracker->PingNowImpl();
 }
 
 void RLZTracker::PingNowImpl() {
-  // Needs to be evaluated. See http://crbug.com/62328.
+  // This is the entry point of a background thread, so I/O is allowed.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   std::wstring lang;
   GoogleUpdateSettings::GetLanguage(&lang);
   if (lang.empty())
     lang = L"en";
   std::wstring brand;
   GoogleUpdateSettings::GetBrand(&brand);
   std::wstring referral;
   GoogleUpdateSettings::GetReferral(&referral);
   if (SendFinancialPing(brand, lang, referral, is_organic(brand))) {
     GoogleUpdateSettings::ClearReferral();
-    base::AutoLock lock(cache_lock_);
-    rlz_cache_.clear();
+
+    {
+      base::AutoLock lock(cache_lock_);
+      rlz_cache_.clear();
+    }
+
+    // Prime the RLZ cache for the access points we are interested in.
+    GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, NULL);
+    GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, NULL);
   }
 }
 
 bool RLZTracker::SendFinancialPing(const std::wstring& brand,
                                    const std::wstring& lang,
                                    const std::wstring& referral,
                                    bool exclude_id) {
   return ::SendFinancialPing(brand, lang, referral, exclude_id);
 }
 
@@ skipping 97 matching lines @@
   std::wstring rlz_local(ASCIIToWide(std::string(str_rlz)));
   if (rlz)
     *rlz = rlz_local;
 
   base::AutoLock lock(cache_lock_);
   rlz_cache_[point] = rlz_local;
   return true;
 }
 
 bool RLZTracker::ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) {
-  if (BrowserThread::CurrentlyOn(BrowserThread::FILE))
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return false;
 
   std::wstring* not_used = NULL;
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&RLZTracker::GetAccessPointRlz, point, not_used));
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   GetInstance()->rlz_cache_.clear();
   GetInstance()->registrar_.RemoveAll();
 }