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

net/disk_cache/bitmap.cc

 // Copyright (c) 2009 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 "net/disk_cache/bitmap.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
@@ skipping 18 matching lines @@
 // Returns the index of the first bit set to |value| from |word|. This code
 // assumes that we'll be able to find that bit.
 int FindLSBNonEmpty(uint32 word, bool value) {
   // If we are looking for 0, negate |word| and look for 1.
   if (!value)
     word = ~word;
 
   return FindLSBSetNonZero(word);
 }
 
-}
+}  // namespace
 
 namespace disk_cache {
 
 Bitmap::Bitmap(int num_bits, bool clear_bits)
     : num_bits_(num_bits),
       array_size_(RequiredArraySize(num_bits)),
       alloc_(true) {
   map_ = new uint32[array_size_];
 
   // Initialize all of the bits.
@@ skipping 48 matching lines @@
     map_[j] |= (1 << i);
   else
     map_[j] &= ~(1 << i);
 }
 
 bool Bitmap::Get(int index) const {
   DCHECK_LT(index, num_bits_);
   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) {
   DCHECK_LT(index, num_bits_);
   DCHECK_GE(index, 0);
   const int i = index & (kIntBits - 1);
   const int j = index / kIntBits;
   map_[j] ^= (1 << i);
 }
 
@@ skipping 183 matching lines @@
   uint32 to_add = 0xffffffff << len;
   to_add = (~to_add) << offset;
   if (value) {
     map_[word] |= to_add;
   } else {
     map_[word] &= ~to_add;
   }
 }
 
 }  // namespace disk_cache