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 edc3b02da1505ceedcd16f6b652e44801ec49d77..57583b8550605e87a0678e3d7863b48cd7397040 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -25,8 +25,6 @@
 #include "net/disk_cache/simple/simple_synchronous_entry.h"
 #include "net/disk_cache/simple/simple_util.h"
 
-using base::File;
-
 namespace disk_cache {
 namespace {
 
@@ -107,9 +105,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;
 
@@ -467,9 +465,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;