Prepare ExternalPolicyDataUpdater and ResourceCache for blocking pool

chrome/browser/policy/cloud/external_policy_data_updater.cc

 // Copyright (c) 2013 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/policy/cloud/external_policy_data_updater.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 286 matching lines @@
     size_t max_parallel_fetches)
     : task_runner_(task_runner),
       external_policy_data_fetcher_(external_policy_data_fetcher.release()),
       max_parallel_jobs_(max_parallel_fetches),
       running_jobs_(0),
       shutting_down_(false) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 }
 
 ExternalPolicyDataUpdater::~ExternalPolicyDataUpdater() {
-  DCHECK(CalledOnValidThread());
+  DCHECK(task_runner_->RunsTasksOnCurrentThread());
   shutting_down_ = true;
   STLDeleteValues(&job_map_);
 }
 
 void ExternalPolicyDataUpdater::FetchExternalData(
     const std::string key,
     const Request& request,
     const FetchSuccessCallback& callback) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   // Check whether a job exists for this |key| already.
   FetchJob* job = job_map_[key];
   if (job) {
     // If the current |job| is handling the given |request| already, nothing
     // needs to be done.
     if (job->request() == request)
       return;
 
     // Otherwise, the current |job| is obsolete. If the |job| is on the queue,
     // its WeakPtr will be invalidated and skipped by StartNextJobs(). If |job|
     // is currently running, it will call OnJobFailed() immediately.
     delete job;
     job_map_.erase(key);
   }
 
   // Start a new job to handle |request|.
   job = new FetchJob(this, key, request, callback);
   job_map_[key] = job;
   ScheduleJob(job);
 }
 
 void ExternalPolicyDataUpdater::CancelExternalDataFetch(
     const std::string& key) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   // If a |job| exists for this |key|, delete it. If the |job| is on the queue,
   // its WeakPtr will be invalidated and skipped by StartNextJobs(). If |job| is
   // currently running, it will call OnJobFailed() immediately.
   std::map<std::string, FetchJob*>::iterator job = job_map_.find(key);
   if (job != job_map_.end()) {
     delete job->second;
     job_map_.erase(job);
   }
 }
@@ skipping 39 matching lines @@
   DCHECK_EQ(job_map_[job->key()], job);
 
   --running_jobs_;
 
   // The job is not deleted when it fails because a retry attempt may have been
   // scheduled.
   StartNextJobs();
 }
 
 }  // namespace policy