Cleanup: avoid foo ? true : false, part 2.

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

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

3 files changed, 4 insertions, 5 deletions

diff --git a/net/disk_cache/bitmap.cc b/net/disk_cache/bitmap.cc
index 6c9aceb..6d469df 100644
--- a/net/disk_cache/bitmap.cc
+++ b/net/disk_cache/bitmap.cc
@@ -36,7 +36,7 @@ int FindLSBNonEmpty(uint32 word, bool value) {
   return FindLSBSetNonZero(word);
 }
 
-}
+}  // namespace
 
 namespace disk_cache {
 
@@ -105,7 +105,7 @@ bool Bitmap::Get(int index) const {
   DCHECK_GE(index, 0);
   const int i = index & (kIntBits-1);
   const int j = index / kIntBits;
-  return map_[j] & (1 << i) ? true : false;
+  return ((map_[j] & (1 << i)) != 0);
 }
 
 void Bitmap::Toggle(int index) {
diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc
index 37df0d7..f8c3bb3 100644
--- a/net/disk_cache/entry_impl.cc
+++ b/net/disk_cache/entry_impl.cc
@@ -451,8 +451,7 @@ bool EntryImpl::IsSameEntry(const std::string& key, uint32 hash) {
       static_cast<size_t>(entry_.Data()->key_len) != key.size())
     return false;
 
-  std::string my_key = GetKey();
-  return key.compare(my_key) ? false : true;
+  return (key.compare(GetKey()) == 0);
 }
 
 void EntryImpl::InternalDoom() {
diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index 20f63c3..cb63557 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -152,7 +152,7 @@ void StressTheCache(int iteration) {
   for (int i = 0;; i++) {
     int slot = rand() % kNumEntries;
     int key = rand() % kNumKeys;
-    bool truncate = rand() % 2 ? false : true;
+    bool truncate = (rand() % 2 == 0);
     int size = kSize - (rand() % 20) * kSize / 20;
 
     if (entries[slot])