Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/base/worker_pool.cc

 // Copyright 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 "cc/base/worker_pool.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 159 matching lines @@
       next_thread_index_(0),
       running_task_count_(0),
       shutdown_(false) {
   base::AutoLock lock(lock_);
 
   while (workers_.size() < num_threads) {
     scoped_ptr<base::DelegateSimpleThread> worker = make_scoped_ptr(
         new base::DelegateSimpleThread(
           this,
           thread_name_prefix +
-          base::StringPrintf(
-              "Worker%lu",
-              static_cast<unsigned long>(workers_.size() + 1)).c_str()));
+          base::StringPrintf("Worker%lu", workers_.size() + 1).c_str()));
     worker->Start();
     workers_.push_back(worker.Pass());
   }
 }
 
 WorkerPool::Inner::~Inner() {
   base::AutoLock lock(lock_);
 
   DCHECK(shutdown_);
 
   // Cancel all pending callbacks.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
-  DCHECK_EQ(0u, pending_tasks_.size());
-  DCHECK_EQ(0u, completed_tasks_.size());
-  DCHECK_EQ(0u, running_task_count_);
+  DCHECK_EQ(pending_tasks_.size(), 0);
+  DCHECK_EQ(completed_tasks_.size(), 0);
+  DCHECK_EQ(running_task_count_, 0);
 }
 
 void WorkerPool::Inner::Shutdown() {
   {
     base::AutoLock lock(lock_);
 
     DCHECK(!shutdown_);
     shutdown_ = true;
 
     // Wake up a worker so it knows it should exit. This will cause all workers
@@ skipping 216 matching lines @@
                      // for completed tasks delay is 0.
                      check_for_completed_tasks_delay == base::TimeDelta()))) {
 }
 
 WorkerPool::~WorkerPool() {
   Shutdown();
 
   // Cancel all pending callbacks.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
-  DCHECK_EQ(0u, completed_tasks_.size());
+  DCHECK_EQ(completed_tasks_.size(), 0);
 }
 
 void WorkerPool::Shutdown() {
   inner_->Shutdown();
   DispatchCompletionCallbacks();
 }
 
 void WorkerPool::PostTaskAndReply(
     const Callback& task, const base::Closure& reply) {
   PostTask(make_scoped_ptr(new WorkerPoolTaskImpl(
@@ skipping 120 matching lines @@
                          TRACE_EVENT_SCOPE_THREAD);
     CancelCheckForCompletedTasks();
     DispatchCompletionCallbacks();
     // Schedule another check for completed tasks if not idle.
     if (!is_idle)
       ScheduleCheckForCompletedTasks();
   }
 }
 
 }  // namespace cc