Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1233)

Unified Diff: content/browser/blob_storage/blob_storage_browsertest.cc

Issue 2550113003: Revert of [BlobStorage] Implementing disk. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/blob_storage/blob_storage_browsertest.cc
diff --git a/content/browser/blob_storage/blob_storage_browsertest.cc b/content/browser/blob_storage/blob_storage_browsertest.cc
deleted file mode 100644
index fdcf7da6ec9b955135fc61474e9fe4a3a074ee55..0000000000000000000000000000000000000000
--- a/content/browser/blob_storage/blob_storage_browsertest.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-// 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"
-#include "content/public/test/content_browser_test.h"
-#include "content/public/test/content_browser_test_utils.h"
-#include "content/shell/browser/shell.h"
-#include "storage/browser/blob/blob_memory_controller.h"
-#include "storage/browser/blob/blob_storage_context.h"
-#include "storage/common/blob_storage/blob_storage_constants.h"
-
-namespace content {
-namespace {
-const size_t kTestBlobStorageIPCThresholdBytes = 5;
-const size_t kTestBlobStorageMaxSharedMemoryBytes = 10;
-
-const size_t kTestBlobStorageMaxBlobMemorySize = 200;
-const uint64_t kTestBlobStorageMaxDiskSpace = 3000;
-const uint64_t kTestBlobStorageMinFileSizeBytes = 20;
-const uint64_t kTestBlobStorageMaxFileSizeBytes = 50;
-} // 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_.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 =
- ChromeBlobStorageContext::GetFor(
- shell()->web_contents()->GetBrowserContext());
- return blob_context->context()->mutable_memory_controller();
- }
-
- void SimpleTest(const GURL& test_url, bool incognito = false) {
- // The test page will perform tests on blob storage, then navigate to either
- // a #pass or #fail ref.
- Shell* the_browser = incognito ? CreateOffTheRecordBrowser() : shell();
-
- VLOG(0) << "Navigating to URL and blocking. " << test_url.spec();
- NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2);
- VLOG(0) << "Navigation done.";
- std::string result =
- the_browser->web_contents()->GetLastCommittedURL().ref();
- if (result != "pass") {
- std::string js_result;
- ASSERT_TRUE(ExecuteScriptAndExtractString(
- the_browser, "window.domAutomationController.send(getLog())",
- &js_result));
- FAIL() << "Failed: " << js_result;
- }
- }
-
- protected:
- storage::BlobStorageLimits limits_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BlobStorageBrowserTest);
-};
-
-IN_PROC_BROWSER_TEST_F(BlobStorageBrowserTest, BlobCombinations) {
- SetBlobLimits();
- 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());
- shell()->Close();
-
- // Make sure we run all file / io tasks.
- base::RunLoop().RunUntilIdle();
- BrowserThread::GetBlockingPool()->FlushForTesting();
- base::RunLoop().RunUntilIdle();
-
- EXPECT_EQ(0u, memory_controller->memory_usage());
- EXPECT_EQ(0ul, memory_controller->disk_usage());
-}
-
-} // namespace content
« no previous file with comments | « content/browser/blob_storage/blob_slice_unittest.cc ('k') | content/browser/blob_storage/blob_storage_context_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698