[cros] RlzValueStore made protected by a cross-process lock and not persisted over browser lifetime…

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"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "net/http/http_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/threading/sequenced_worker_pool.h"
-#endif
-
 #if defined(OS_WIN)
 #include "chrome/installer/util/google_update_settings.h"
 #else
 namespace GoogleUpdateSettings {
 static bool GetLanguage(string16* language) {
   // TODO(thakis): Implement.
   NOTIMPLEMENTED();
   return false;
 }
 
 // The referral program is defunct and not used. No need to implement these
 // functions on non-Win platforms.
 static bool GetReferral(string16* referral) {
   return true;
 }
 static bool ClearReferral() {
   return true;
 }
 }  // namespace GoogleUpdateSettings
 #endif
 
 using content::BrowserThread;
 using content::NavigationEntry;
 
 namespace {
 
-const char kRlzThreadName[] = "RLZ_thread";
-
 bool IsBrandOrganic(const std::string& brand) {
   return brand.empty() || google_util::IsOrganic(brand);
 }
 
 void RecordProductEvents(bool first_run,
                          bool is_google_default_search,
                          bool is_google_homepage,
                          bool is_google_in_startpages,
                          bool already_ran,
                          bool omnibox_used,
@@ skipping 99 matching lines @@
 RLZTracker* RLZTracker::GetInstance() {
   return tracker_ ? tracker_ : Singleton<RLZTracker>::get();
 }
 
 RLZTracker::RLZTracker()
     : first_run_(false),
       send_ping_immediately_(false),
       is_google_default_search_(false),
       is_google_homepage_(false),
       is_google_in_startpages_(false),
-      rlz_thread_(kRlzThreadName),
       blocking_task_runner_(NULL),
       url_request_context_(NULL),
       already_ran_(false),
       omnibox_used_(false),
       homepage_used_(false) {
 }
 
 RLZTracker::~RLZTracker() {
 }
 
@@ skipping 64 matching lines @@
 void RLZTracker::ScheduleDelayedInit(int delay) {
   // The RLZTracker is a singleton object that outlives any runnable tasks
   // that will be queued up.
   blocking_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&RLZTracker::DelayedInit, base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(delay));
 }
 
 bool RLZTracker::InitWorkers() {
-  base::Thread::Options options;
-  options.message_loop_type = MessageLoop::TYPE_IO;
-  if (!rlz_thread_.StartWithOptions(options))
-    return false;
-  blocking_task_runner_ = rlz_thread_.message_loop_proxy();
-
-#if defined(OS_CHROMEOS)
   base::SequencedWorkerPool* worker_pool =
       content::BrowserThread::GetBlockingPool();
   if (!worker_pool)
     return false;
-  rlz_lib::SetIOTaskRunner(
+  blocking_task_runner_ =
       worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
           worker_pool->GetSequenceToken(),
-          base::SequencedWorkerPool::BLOCK_SHUTDOWN));
-#endif
+          base::SequencedWorkerPool::BLOCK_SHUTDOWN);
   return true;
 }
 
 void RLZTracker::DelayedInit() {
   if (!already_ran_)
     rlz_lib::SetURLRequestContext(url_request_context_);
 
   bool schedule_ping = false;
 
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
@@ skipping 236 matching lines @@
       base::Bind(base::IgnoreResult(&RLZTracker::GetAccessPointRlz), point,
                  not_used));
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   GetInstance()->rlz_cache_.clear();
   GetInstance()->registrar_.RemoveAll();
 }