Make blocking_task_runner_ a member variable instead of sequence_token_.

BUG=NONE
TEST=unit tests.

Review URL: https://chromiumcodereview.appspot.com/10833020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148506 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/gdata/gdata_system_service.cc

@@ -27,28 +27,22 @@
 using content::BrowserContext;
 using content::BrowserThread;
 
+namespace gdata {
 namespace {
 
 // Used in test to setup system service.
-gdata::DocumentsServiceInterface* g_test_documents_service = NULL;
+DocumentsServiceInterface* g_test_documents_service = NULL;
 const std::string* g_test_cache_root = NULL;
 
-scoped_refptr<base::SequencedTaskRunner> GetTaskRunner(
-    const base::SequencedWorkerPool::SequenceToken& sequence_token) {
-  return BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
-      sequence_token);
-}
-
-}  // nemaspace
-
-namespace gdata {
+}  // namespace
 
-//===================== GDataSystemService ====================================
 GDataSystemService::GDataSystemService(Profile* profile)
     : profile_(profile),
-      sequence_token_(BrowserThread::GetBlockingPool()->GetSequenceToken()),
       cache_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
+  blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner(
+      blocking_pool->GetSequenceToken());
 }
 
 GDataSystemService::~GDataSystemService() {
@@ -64,7 +58,7 @@ void GDataSystemService::Initialize(
   documents_service_.reset(documents_service);
   cache_ = GDataCache::CreateGDataCacheOnUIThread(
       cache_root,
-      GetTaskRunner(sequence_token_));
+      blocking_task_runner_);
   uploader_.reset(new GDataUploader(docs_service()));
   webapps_registry_.reset(new DriveWebAppsRegistry);
   file_system_.reset(new GDataFileSystem(profile_,
@@ -72,7 +66,7 @@ void GDataSystemService::Initialize(
                                          docs_service(),
                                          uploader(),
                                          webapps_registry(),
-                                         GetTaskRunner(sequence_token_)));
+                                         blocking_task_runner_));
   download_observer_.reset(new GDataDownloadObserver(uploader(),
                                                      file_system()));
   sync_client_.reset(new GDataSyncClient(profile_, file_system(), cache()));

chrome/browser/chromeos/gdata/gdata_system_service.h

@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ -66,7 +68,7 @@ class GDataSystemService : public ProfileKeyedService  {
   friend class GDataSystemServiceFactory;
 
   Profile* profile_;
-  const base::SequencedWorkerPool::SequenceToken sequence_token_;
+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   GDataCache* cache_;
   scoped_ptr<DocumentsServiceInterface> documents_service_;
   scoped_ptr<GDataUploader> uploader_;