Snapshot of all changes to get jumbo in blink and content.

net/disk_cache/simple/simple_index_file.cc

 // Copyright (c) 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 "net/disk_cache/simple/simple_index_file.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/disk_cache/simple/simple_backend_version.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
 #include "net/disk_cache/simple/simple_histogram_macros.h"
 #include "net/disk_cache/simple/simple_index.h"
 #include "net/disk_cache/simple/simple_synchronous_entry.h"
 #include "net/disk_cache/simple/simple_util.h"
 #include "third_party/zlib/zlib.h"
 
-using base::File;
-
 namespace disk_cache {
 namespace {
 
 const int kEntryFilesHashLength = 16;
 const int kEntryFilesSuffixLength = 2;
 
 // Limit on how big a file we are willing to work with, to avoid crashes
 // when its corrupt.
 const int kMaxEntriesInIndex = 1000000;
 
@@ skipping 62 matching lines @@
     quality = STALE_INDEX_MISSED_ENTRIES;
   else if (extra_entry_count > 0)
     quality = STALE_INDEX_EXTRA_ENTRIES;
   else
     quality = STALE_INDEX_OK;
   SIMPLE_CACHE_UMA(ENUMERATION, "StaleIndexQuality", cache_type, quality,
                    STALE_INDEX_MAX);
 }
 
 bool WritePickleFile(base::Pickle* pickle, const base::FilePath& file_name) {
-  File file(
+  base::File file(
       file_name,
-      File::FLAG_CREATE_ALWAYS | File::FLAG_WRITE | File::FLAG_SHARE_DELETE);
+      base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE | base::File::FLAG_SHARE_DELETE);
   if (!file.IsValid())
     return false;
 
   int bytes_written =
       file.Write(0, static_cast<const char*>(pickle->data()), pickle->size());
   if (bytes_written != base::checked_cast<int>(pickle->size())) {
     simple_util::SimpleCacheDeleteFile(file_name);
     return false;
   }
   return true;
@@ skipping 337 matching lines @@
   }
   UmaRecordIndexInitMethod(out_result->init_method, cache_type);
 }
 
 // static
 void SimpleIndexFile::SyncLoadFromDisk(const base::FilePath& index_filename,
                                        base::Time* out_last_cache_seen_by_index,
                                        SimpleIndexLoadResult* out_result) {
   out_result->Reset();
 
-  File file(index_filename, File::FLAG_OPEN | File::FLAG_READ |
-                                File::FLAG_SHARE_DELETE |
-                                File::FLAG_SEQUENTIAL_SCAN);
+  base::File file(index_filename, base::File::FLAG_OPEN | base::File::FLAG_READ |
+                                base::File::FLAG_SHARE_DELETE |
+                                base::File::FLAG_SEQUENTIAL_SCAN);
   if (!file.IsValid())
     return;
 
   // Sanity-check the length. We don't want to crash trying to read some corrupt
   // 10GiB file or such.
   int64_t file_length = file.GetLength();
   if (file_length < 0 || file_length > kMaxIndexFileSizeBytes) {
     simple_util::SimpleCacheDeleteFile(index_filename);
     return;
   }
@@ skipping 119 matching lines @@
 bool SimpleIndexFile::LegacyIsIndexFileStale(
     base::Time cache_last_modified,
     const base::FilePath& index_file_path) {
   base::Time index_mtime;
   if (!simple_util::GetMTime(index_file_path, &index_mtime))
     return true;
   return index_mtime < cache_last_modified;
 }
 
 }  // namespace disk_cache