summaryrefslogtreecommitdiffstats
path: root/cc/base
diff options
context:
space:
mode:
Diffstat (limited to 'cc/base')
-rw-r--r--cc/base/scoped_ptr_hash_map.h2
-rw-r--r--cc/base/tiling_data_unittest.cc6
-rw-r--r--cc/base/worker_pool.cc12
3 files changed, 9 insertions, 11 deletions
diff --git a/cc/base/scoped_ptr_hash_map.h b/cc/base/scoped_ptr_hash_map.h
index 970984a..3a749a5 100644
--- a/cc/base/scoped_ptr_hash_map.h
+++ b/cc/base/scoped_ptr_hash_map.h
@@ -117,7 +117,7 @@ class ScopedPtrHashMap {
return it->second;
}
- inline bool contains(const Key& k) const { return data_.count(k) > 0; }
+ inline bool contains(const Key& k) const { return data_.count(k); }
inline void clear() { STLDeleteValues(&data_); }
diff --git a/cc/base/tiling_data_unittest.cc b/cc/base/tiling_data_unittest.cc
index db2d6f2..ea141ad 100644
--- a/cc/base/tiling_data_unittest.cc
+++ b/cc/base/tiling_data_unittest.cc
@@ -954,7 +954,7 @@ void TestIterate(
}
EXPECT_TRUE(found);
}
- EXPECT_EQ(0u, expected.size());
+ EXPECT_EQ(0, expected.size());
}
// Make sure this also works with a difference iterator and an empty ignore.
@@ -973,7 +973,7 @@ void TestIterate(
}
EXPECT_TRUE(found);
}
- EXPECT_EQ(0u, expected.size());
+ EXPECT_EQ(0, expected.size());
}
}
@@ -1078,7 +1078,7 @@ void TestDiff(
}
EXPECT_TRUE(found);
}
- EXPECT_EQ(0u, expected.size());
+ EXPECT_EQ(0, expected.size());
}
TEST(TilingDataTest, DifferenceIteratorIgnoreGeometry) {
diff --git a/cc/base/worker_pool.cc b/cc/base/worker_pool.cc
index 2c47101..d276529 100644
--- a/cc/base/worker_pool.cc
+++ b/cc/base/worker_pool.cc
@@ -177,9 +177,7 @@ WorkerPool::Inner::Inner(WorkerPool* worker_pool,
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());
}
@@ -193,9 +191,9 @@ WorkerPool::Inner::~Inner() {
// 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() {
@@ -432,7 +430,7 @@ WorkerPool::~WorkerPool() {
// Cancel all pending callbacks.
weak_ptr_factory_.InvalidateWeakPtrs();
- DCHECK_EQ(0u, completed_tasks_.size());
+ DCHECK_EQ(completed_tasks_.size(), 0);
}
void WorkerPool::Shutdown() {