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

chrome/browser/rlz/rlz.h

 // 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.
 
 #ifndef CHROME_BROWSER_RLZ_RLZ_H_
 #define CHROME_BROWSER_RLZ_RLZ_H_
 
 #include "build/build_config.h"
 
 #if defined(ENABLE_RLZ)
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "base/string16.h"
-#include "base/threading/thread.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "rlz/lib/rlz_lib.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // RLZ is a library which is used to measure distribution scenarios.
 // Its job is to record certain lifetime events in the registry and to send
@@ skipping 77 matching lines @@
   friend struct DefaultSingletonTraits<RLZTracker>;
   friend class base::RefCountedThreadSafe<RLZTracker>;
 
   // Implementation called from InitRlzDelayed() static method.
   bool Init(bool first_run,
             int delay,
             bool google_default_search,
             bool google_default_homepage,
             bool is_google_in_startpages);
 
-  // Initializes task runners for tasks that access RlzValueStore and perform
-  // disk I/O.
-  virtual bool InitWorkers();
-
   // Implementation called from RecordProductEvent() static method.
   bool RecordProductEventImpl(rlz_lib::Product product,
                               rlz_lib::AccessPoint point,
                               rlz_lib::Event event_id);
 
   // Records FIRST_SEARCH event. Called from Observe() on blocking task runner.
   void RecordFirstSearch(rlz_lib::AccessPoint point);
 
   // Implementation called from GetAccessPointRlz() static method.
   bool GetAccessPointRlzImpl(rlz_lib::AccessPoint point, string16* rlz);
@@ skipping 32 matching lines @@
   // will be returned from GetInstance() instead of the regular singleton.
   static RLZTracker* tracker_;
 
   // Configuation data for RLZ tracker. Set by call to Init().
   bool first_run_;
   bool send_ping_immediately_;
   bool is_google_default_search_;
   bool is_google_homepage_;
   bool is_google_in_startpages_;
 
-  // Dedicated RLZ thread for accessing RlzValueStore and doing I/O.
-  base::Thread rlz_thread_;
-
-  // Sequenced task runner used to post blocking tasks that access
-  // RlzValueStore.
-  base::SequencedTaskRunner* blocking_task_runner_;
+  // Unique sequence token so that tasks posted by RLZTracker are executed
+  // sequentially in the blocking pool.
+  base::SequencedWorkerPool::SequenceToken worker_pool_token_;
 
   // URLRequestContextGetter used by RLZ library.
   net::URLRequestContextGetter* url_request_context_;
 
   // Keeps track if the RLZ tracker has already performed its delayed
   // initialization.
   bool already_ran_;
 
   // Keeps a cache of RLZ access point strings, since they rarely change.
   // The cache must be protected by a lock since it may be accessed from
   // the UI thread for reading and the IO thread for reading and/or writing.
   base::Lock cache_lock_;
   std::map<rlz_lib::AccessPoint, string16> rlz_cache_;
 
   // Keeps track of whether the omnibox or host page have been used.
   bool omnibox_used_;
   bool homepage_used_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RLZTracker);
 };
 
 #endif  // defined(ENABLE_RLZ)
 
 #endif  // CHROME_BROWSER_RLZ_RLZ_H_