Misc. cleanup, primarily removing unused locals.

net/disk_cache/cache_util.cc

 // Copyright (c) 2012 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/cache_util.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
@@ skipping 127 matching lines @@
       FROM_HERE, base::Bind(&CleanupCallback, path, name_str), true);
   return true;
 }
 
 // Returns the preferred maximum number of bytes for the cache given the
 // number of available bytes.
 int PreferredCacheSize(int64 available) {
   if (available < 0)
     return kDefaultCacheSize;
 
-  int64 max_size = PreferredCacheSizeInternal(available);
-
   // Limit cache size to somewhat less than kint32max to avoid potential
   // integer overflows in cache backend implementations.
-  DCHECK(kDefaultCacheSize * 4 < kint32max);
-  if (max_size > kDefaultCacheSize * 4)
-    max_size = kDefaultCacheSize * 4;
-
-  return implicit_cast<int32>(max_size);

[Peter Kasting, 2014/10/08 19:21:56]

This needs a static_cast, not an implicit_cast, to avoid compiler warnings.

[rvargas (doing something else), 2014/10/08 20:01:14]

Certainly!

+  DCHECK_LT(kDefaultCacheSize * 4, kint32max);
+  return static_cast<int32>(std::min(
+      PreferredCacheSizeInternal(available),
+      static_cast<int64>(kDefaultCacheSize * 4)));
 }
 
 }  // namespace disk_cache