[BlobStorage] Enabling disk paging and direct storage.

content/browser/blob_storage/blob_storage_browsertest.cc

 // Copyright 2016 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 "base/run_loop.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 // This browser test is aimed towards exercising the blob storage transportation
 // strategies and paging memory to disk.
 class BlobStorageBrowserTest : public ContentBrowserTest {
  public:
   BlobStorageBrowserTest() {
     limits_.max_ipc_memory_size = kTestBlobStorageIPCThresholdBytes;
     limits_.max_shared_memory_size = kTestBlobStorageMaxSharedMemoryBytes;
     limits_.max_blob_in_memory_space = kTestBlobStorageMaxBlobMemorySize;
-    limits_.max_blob_disk_space = kTestBlobStorageMaxDiskSpace;
+    limits_.desired_max_disk_space = kTestBlobStorageMaxDiskSpace;
+    limits_.effective_max_disk_space = kTestBlobStorageMaxDiskSpace;
     limits_.min_page_file_size = kTestBlobStorageMinFileSizeBytes;
     limits_.max_file_size = kTestBlobStorageMaxFileSizeBytes;
   }
 
   void SetBlobLimits() {
     GetMemoryController()->set_limits_for_testing(limits_);
   }
 
   storage::BlobMemoryController* GetMemoryController() {
     content::ChromeBlobStorageContext* blob_context =
@@ skipping 33 matching lines @@
   SimpleTest(GetTestUrl("blob_storage", "blob_creation_and_slicing.html"));
   storage::BlobMemoryController* memory_controller = GetMemoryController();
   // Our exact usages depend on IPC message ordering & garbage collection.
   // Since this is basically random, we just check bounds.
   EXPECT_LT(0u, memory_controller->memory_usage());
   EXPECT_LT(0ul, memory_controller->disk_usage());
   EXPECT_GT(memory_controller->disk_usage(),
             static_cast<uint64_t>(memory_controller->memory_usage()));
   EXPECT_GT(limits_.max_blob_in_memory_space,
             memory_controller->memory_usage());
-  EXPECT_GT(limits_.max_blob_disk_space, memory_controller->disk_usage());
+  EXPECT_GT(limits_.effective_max_disk_space, memory_controller->disk_usage());
   shell()->Close();
 
   // Make sure we run all file / io tasks.
   base::RunLoop().RunUntilIdle();
   BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace content