Update cc/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes

BUG=110610
TBR=enne

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

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

3 files changed, 13 insertions, 13 deletions

diff --git a/cc/base/worker_pool.cc b/cc/base/worker_pool.cc
index bbf51c2..ab7d869 100644
--- a/cc/base/worker_pool.cc
+++ b/cc/base/worker_pool.cc
@@ -78,7 +78,7 @@ bool WorkerPoolTask::IsReadyToRun() const {
   // TODO(reveman): Use counter to improve performance.
   for (TaskVector::const_reverse_iterator it = dependencies_.rbegin();
        it != dependencies_.rend(); ++it) {
-    WorkerPoolTask* dependency = *it;
+    WorkerPoolTask* dependency = it->get();
     if (!dependency->HasFinishedRunning())
       return false;
   }
@@ -296,7 +296,7 @@ void WorkerPool::Inner::ScheduleTasks(internal::WorkerPoolTask* root) {
     // First remove all completed tasks from |new_pending_tasks|.
     for (TaskDeque::iterator it = completed_tasks_.begin();
          it != completed_tasks_.end(); ++it) {
-      internal::WorkerPoolTask* task = *it;
+      internal::WorkerPoolTask* task = it->get();
       new_pending_tasks.take_and_erase(task);
     }
 
@@ -430,9 +430,9 @@ void WorkerPool::Inner::Run() {
     ready_to_run_tasks_.erase(ready_to_run_tasks_.begin());
 
     // Move task from |pending_tasks_| to |running_tasks_|.
-    DCHECK(pending_tasks_.contains(task));
-    DCHECK(!running_tasks_.contains(task));
-    running_tasks_.set(task, pending_tasks_.take_and_erase(task));
+    DCHECK(pending_tasks_.contains(task.get()));
+    DCHECK(!running_tasks_.contains(task.get()));
+    running_tasks_.set(task.get(), pending_tasks_.take_and_erase(task.get()));
 
     // There may be more work available, so wake up another worker thread.
     has_ready_to_run_tasks_cv_.Signal();
@@ -450,13 +450,13 @@ void WorkerPool::Inner::Run() {
     task->DidRun();
 
     // Now iterate over all dependents to check if they are ready to run.
-    scoped_ptr<ScheduledTask> scheduled_task = running_tasks_.take_and_erase(
-        task);
+    scoped_ptr<ScheduledTask> scheduled_task =
+        running_tasks_.take_and_erase(task.get());
     if (scheduled_task) {
       typedef internal::WorkerPoolTask::TaskVector TaskVector;
       for (TaskVector::iterator it = scheduled_task->dependents().begin();
            it != scheduled_task->dependents().end(); ++it) {
-        internal::WorkerPoolTask* dependent = *it;
+        internal::WorkerPoolTask* dependent = it->get();
         if (!dependent->IsReadyToRun())
           continue;
 
@@ -516,7 +516,7 @@ unsigned WorkerPool::Inner::BuildScheduledTaskMapRecursive(
   typedef internal::WorkerPoolTask::TaskVector TaskVector;
   for (TaskVector::iterator it = task->dependencies().begin();
        it != task->dependencies().end(); ++it) {
-    internal::WorkerPoolTask* dependency = *it;
+    internal::WorkerPoolTask* dependency = it->get();
     priority = BuildScheduledTaskMapRecursive(
         dependency, task, priority, scheduled_tasks);
   }
diff --git a/cc/base/worker_pool_perftest.cc b/cc/base/worker_pool_perftest.cc
index c03bcc8..c203526 100644
--- a/cc/base/worker_pool_perftest.cc
+++ b/cc/base/worker_pool_perftest.cc
@@ -113,7 +113,7 @@ class WorkerPoolPerfTest : public testing::Test,
                        max_depth,
                        num_children_per_node);
       }
-    } else if (leaf_task_) {
+    } else if (leaf_task_.get()) {
       children.push_back(leaf_task_);
     }
     dependencies->push_back(make_scoped_refptr(new PerfTaskImpl(&children)));
@@ -161,7 +161,7 @@ class WorkerPoolPerfTest : public testing::Test,
       scoped_refptr<PerfTaskImpl> root_task(
           make_scoped_refptr(new PerfTaskImpl(&children)));
 
-      worker_pool_->ScheduleTasks(root_task);
+      worker_pool_->ScheduleTasks(root_task.get());
       leaf_task_->WaitForTaskToStartRunning();
       worker_pool_->ScheduleTasks(NULL);
       worker_pool_->CheckForCompletedTasks();
@@ -182,7 +182,7 @@ class WorkerPoolPerfTest : public testing::Test,
       scoped_refptr<PerfControlTaskImpl> root_task(
           make_scoped_refptr(new PerfControlTaskImpl(&children)));
 
-      worker_pool_->ScheduleTasks(root_task);
+      worker_pool_->ScheduleTasks(root_task.get());
       root_task->WaitForTaskToStartRunning();
       root_task->AllowTaskToFinish();
       worker_pool_->CheckForCompletedTasks();
diff --git a/cc/base/worker_pool_unittest.cc b/cc/base/worker_pool_unittest.cc
index de904b1..9dfe565 100644
--- a/cc/base/worker_pool_unittest.cc
+++ b/cc/base/worker_pool_unittest.cc
@@ -72,7 +72,7 @@ class FakeWorkerPool : public WorkerPool {
                          &tasks));
 
     scheduled_tasks_completion_.reset(new CompletionEvent);
-    WorkerPool::ScheduleTasks(completion_task);
+    WorkerPool::ScheduleTasks(completion_task.get());
   }
 
   void WaitForTasksToComplete() {