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

chrome/browser/rlz/rlz.cc

Index: chrome/browser/rlz/rlz.cc
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 7005e32d47c199b57d171818dd68c6e9a37feff3..949ffe6a938d7ce9839e7ae1de0ac10662aa47ec 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -14,6 +14,7 @@
 #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"
@@ -26,10 +27,6 @@
 #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
@@ -56,8 +53,6 @@ using content::NavigationEntry;
 
 namespace {
 
-const char kRlzThreadName[] = "RLZ_thread";
-
 bool IsBrandOrganic(const std::string& brand) {
   return brand.empty() || google_util::IsOrganic(brand);
 }
@@ -177,7 +172,6 @@ RLZTracker::RLZTracker()
       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),
@@ -262,22 +256,14 @@ void RLZTracker::ScheduleDelayedInit(int 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;
 }