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

content/browser/blob_storage/chrome_blob_storage_context.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 "content/browser/blob_storage/chrome_blob_storage_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ skipping 17 matching lines @@
 #include "storage/browser/blob/blob_memory_controller.h"
 #include "storage/browser/blob/blob_storage_context.h"
 
 using base::FilePath;
 using base::UserDataAdapter;
 using storage::BlobStorageContext;
 
 namespace content {
 
 namespace {
-const FilePath::CharType kBlobStorageContextKeyName[] =
+  // FIXME: Identical to the constant in resource_context_impl.cc
+const FilePath::CharType kBlobStorageContextKeyNameFoo[] =
     FILE_PATH_LITERAL("content_blob_storage_context");
 const FilePath::CharType kBlobStorageParentDirectory[] =
     FILE_PATH_LITERAL("blob_storage");
 
 // Removes all folders in the parent directory except for the
 // |current_run_dir| folder. If this path is empty, then we delete all folders.
 void RemoveOldBlobStorageDirectories(FilePath blob_storage_parent,
                                      const FilePath& current_run_dir) {
   if (!base::DirectoryExists(blob_storage_parent)) {
     return;
@@ skipping 26 matching lines @@
 };
 
 }  // namespace
 
 ChromeBlobStorageContext::ChromeBlobStorageContext() {}
 
 ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
     BrowserContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (!context->GetUserData(kBlobStorageContextKeyName)) {
+  if (!context->GetUserData(kBlobStorageContextKeyNameFoo)) {
     scoped_refptr<ChromeBlobStorageContext> blob =
         new ChromeBlobStorageContext();
     context->SetUserData(
-        kBlobStorageContextKeyName,
+        kBlobStorageContextKeyNameFoo,
         base::MakeUnique<UserDataAdapter<ChromeBlobStorageContext>>(
             blob.get()));
 
     // Check first to avoid memory leak in unittests.
     bool io_thread_valid = BrowserThread::IsMessageLoopValid(BrowserThread::IO);
 
     // Resolve our storage directories.
     FilePath blob_storage_parent =
         context->GetPath().Append(kBlobStorageParentDirectory);
     FilePath blob_storage_dir = blob_storage_parent.Append(
@@ skipping 19 matching lines @@
     if (io_thread_valid) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&ChromeBlobStorageContext::InitializeOnIOThread, blob,
                      base::Passed(&blob_storage_dir),
                      base::Passed(&file_task_runner)));
     }
   }
 
   return UserDataAdapter<ChromeBlobStorageContext>::Get(
-      context, kBlobStorageContextKeyName);
+      context, kBlobStorageContextKeyNameFoo);
 }
 
 void ChromeBlobStorageContext::InitializeOnIOThread(
     FilePath blob_storage_dir,
     scoped_refptr<base::TaskRunner> file_task_runner) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   context_.reset(new BlobStorageContext(std::move(blob_storage_dir),
                                         std::move(file_task_runner)));
   // Signal the BlobMemoryController when it's appropriate to calculate its
   // storage limits.
@@ skipping 77 matching lines @@
     std::unique_ptr<storage::BlobDataHandle> handle =
         blob_context->GetBlobDataFromUUID(element.blob_uuid());
     if (!handle)
       return false;
     blob_handles->push_back(std::move(handle));
   }
   return true;
 }
 
 }  // namespace content