Moved JsonPrefStore to use SequencedWorkerPool

chrome/browser/sync/credential_cache_service_win.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.
 
 #include "chrome/browser/sync/credential_cache_service_win.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 623 matching lines @@
                profile_));
     chrome::GetDefaultUserDataDirectory(&alternate_user_data_dir);
   }
 
   FilePath alternate_default_profile_dir =
       ProfileManager::GetDefaultProfileDir(alternate_user_data_dir);
   return alternate_default_profile_dir.Append(chrome::kSyncCredentialsFilename);
 }
 
 void CredentialCacheService::InitializeLocalCredentialCacheWriter() {
-  local_store_ = new JsonPrefStore(
+  local_store_ = JsonPrefStore::Create(
       GetCredentialPathInCurrentProfile(),
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::FILE));
+      JsonPrefStore::GetTaskRunnerForFile(GetCredentialPathInCurrentProfile(),
+                                          BrowserThread::GetBlockingPool()));

[Mattias Nissler (ping if slow), 2012/10/22 17:28:21]

Do we have the assumption that the profile directory has been created here? If
so, are we sure that has actually happened, given that the dir creation task may
run on a different blocking pool thread?

[zel, 2012/10/24 02:20:11]

I am not really sure where that actually happens for CredentialCacheService.
Since this is windows-specific... I am just reverting this to its original task
runner.

   local_store_observer_ = new LocalStoreObserver(this, local_store_);
   local_store_->ReadPrefsAsync(NULL);
 }
 
 void CredentialCacheService::StartListeningForSyncConfigChanges() {
   // Register for notifications for google sign in and sign out.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
                  content::Source<Profile>(profile_));
   registrar_.Add(this,
@@ skipping 28 matching lines @@
                  content::Source<TokenService>(token_service));
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKENS_CLEARED,
                  content::Source<TokenService>(token_service));
 }
 
 void CredentialCacheService::LookForCachedCredentialsInAlternateProfile() {
   // Attempt to read cached credentials from the alternate profile. If no file
   // exists, ReadPrefsAsync() will cause PREF_READ_ERROR_NO_FILE to be returned
   // after initialization is complete.
-  alternate_store_ = new JsonPrefStore(
-      GetCredentialPathInAlternateProfile(),
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::FILE));
+  FilePath path = GetCredentialPathInAlternateProfile();
+  alternate_store_ = JsonPrefStore::Create(
+      path,
+      JsonPrefStore::GetTaskRunnerForFile(
+          path,
+          BrowserThread::GetBlockingPool()));
   alternate_store_observer_ = new AlternateStoreObserver(this,
                                                          alternate_store_);
   alternate_store_->ReadPrefsAsync(NULL);
 }
 
 bool CredentialCacheService::HasUserSignedOut() {
   DCHECK(local_store_.get());
   // If HasPref() is false, the user never signed in, since there are no
   // previously cached credentials. If the kGoogleServicesUsername pref is
   // empty, it means that the user signed in and subsequently signed out.
@@ skipping 159 matching lines @@
          !HasUserSignedOut() &&
          !alternate_google_services_username.empty() &&
          !alternate_lsid.empty() &&
          !alternate_sid.empty() &&
          !(alternate_encryption_bootstrap_token.empty() &&
            alternate_keystore_encryption_bootstrap_token.empty()) &&
          !service->setup_in_progress();
 }
 
 }  // namespace syncer