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

net/disk_cache/simple/simple_index_file.cc

Index: net/disk_cache/simple/simple_index_file.cc
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc
index 842a569a04322b3b69c0c03b05c84f81263105f4..136c9a8e7b0f4eec253e1600444f6d5b794ad2f9 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -26,8 +26,6 @@
 #include "net/disk_cache/simple/simple_util.h"
 #include "third_party/zlib/zlib.h"
 
-using base::File;
-
 namespace disk_cache {
 namespace {
 
@@ -110,9 +108,9 @@ void UmaRecordStaleIndexQuality(int missed_entry_count,
 }
 
 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;
 
@@ -470,9 +468,9 @@ void SimpleIndexFile::SyncLoadFromDisk(const base::FilePath& index_filename,
                                        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;