cc: Remove ScopedPtrDeque.

cc/raster/task_graph_runner_unittest.cc

 // Copyright 2014 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 "cc/raster/task_graph_runner.h"
 
+#include <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/simple_thread.h"
-#include "cc/base/scoped_ptr_deque.h"
+#include "cc/base/container_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 const int kNamespaceCount = 3;
 
 class TaskGraphRunnerTestBase {
  public:
   struct TaskInfo {
@@ skipping 151 matching lines @@
           make_scoped_ptr(new base::DelegateSimpleThread(this, "TestWorker"));
       worker->Start();
       workers_.push_back(worker.Pass());
     }
 
     for (int i = 0; i < kNamespaceCount; ++i)
       namespace_token_[i] = task_graph_runner_->GetNamespaceToken();
   }
   void TearDown() override {
     task_graph_runner_->Shutdown();
-    while (workers_.size()) {
-      scoped_ptr<base::DelegateSimpleThread> worker = workers_.take_front();
+    while (!workers_.empty()) {
+      scoped_ptr<base::DelegateSimpleThread> worker = PopFront(&workers_);
       worker->Join();
     }
   }
 
  private:
   // Overridden from base::DelegateSimpleThread::Delegate:
   void Run() override { task_graph_runner_->Run(); }
 
-  ScopedPtrDeque<base::DelegateSimpleThread> workers_;
+  std::deque<scoped_ptr<base::DelegateSimpleThread>> workers_;
 };
 
 TEST_P(TaskGraphRunnerTest, Basic) {
   for (int i = 0; i < kNamespaceCount; ++i) {
     EXPECT_EQ(0u, run_task_ids(i).size());
     EXPECT_EQ(0u, on_task_completed_ids(i).size());
 
     ScheduleTasks(i, std::vector<TaskInfo>(1, TaskInfo(i, 0u, 0u, 0u, 0u)));
   }
 
@@ skipping 117 matching lines @@
     EXPECT_EQ(0u, run_task_ids(i)[2]);
     EXPECT_EQ(2u, run_task_ids(i)[3]);
     ASSERT_EQ(2u, on_task_completed_ids(i).size());
     EXPECT_EQ(1u, on_task_completed_ids(i)[0]);
     EXPECT_EQ(0u, on_task_completed_ids(i)[1]);
   }
 }
 
 }  // namespace
 }  // namespace cc