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

content/browser/fileapi/fileapi_message_filter.cc

Index: content/browser/fileapi/fileapi_message_filter.cc
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 543f16cf8d0ffecdedc521b8d3bf8c881cadf9b1..da521ad78cffd6d858be33af9bcf01d2bb788dbb 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -54,7 +54,7 @@ namespace content {
 
 namespace {
 
-const uint32_t kFilteredMessageClasses[] = {FileSystemMsgStart, BlobMsgStart};
+const uint32_t kFileApiFilteredMessageClasses[] = {FileSystemMsgStart, BlobMsgStart};
 
 void RevokeFilePermission(int child_id, const base::FilePath& path) {
   ChildProcessSecurityPolicyImpl::GetInstance()->RevokeAllPermissionsForFile(
@@ -68,8 +68,8 @@ FileAPIMessageFilter::FileAPIMessageFilter(
     net::URLRequestContextGetter* request_context_getter,
     storage::FileSystemContext* file_system_context,
     ChromeBlobStorageContext* blob_storage_context)
-    : BrowserMessageFilter(kFilteredMessageClasses,
-                           arraysize(kFilteredMessageClasses)),
+    : BrowserMessageFilter(kFileApiFilteredMessageClasses,
+                           arraysize(kFileApiFilteredMessageClasses)),
       process_id_(process_id),
       context_(file_system_context),
       security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()),
@@ -86,8 +86,8 @@ FileAPIMessageFilter::FileAPIMessageFilter(
     net::URLRequestContext* request_context,
     storage::FileSystemContext* file_system_context,
     ChromeBlobStorageContext* blob_storage_context)
-    : BrowserMessageFilter(kFilteredMessageClasses,
-                           arraysize(kFilteredMessageClasses)),
+    : BrowserMessageFilter(kFileApiFilteredMessageClasses,
+                           arraysize(kFileApiFilteredMessageClasses)),
       process_id_(process_id),
       context_(file_system_context),
       security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()),
@@ -161,9 +161,9 @@ void FileAPIMessageFilter::OnOpenFileSystem(int request_id,
                                             storage::FileSystemType type) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (type == storage::kFileSystemTypeTemporary) {
-    RecordAction(base::UserMetricsAction("OpenFileSystemTemporary"));
+    base::RecordAction(base::UserMetricsAction("OpenFileSystemTemporary"));
   } else if (type == storage::kFileSystemTypePersistent) {
-    RecordAction(base::UserMetricsAction("OpenFileSystemPersistent"));
+    base::RecordAction(base::UserMetricsAction("OpenFileSystemPersistent"));
   }
   storage::OpenFileSystemMode mode =
       storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT;