summaryrefslogtreecommitdiffstats
path: root/webkit/blob/blob_url_request_job_unittest.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 23:00:51 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 23:00:51 +0000
commita3c71e8edf494687af2e67bc8fe8b013577bcbb6 (patch)
treeee46aaaf7a90f4b57065f6af59c2b6a647d92c00 /webkit/blob/blob_url_request_job_unittest.cc
parent378429dc295cf26b11d20f9e52bc568e4dbf3b4e (diff)
downloadchromium_src-a3c71e8edf494687af2e67bc8fe8b013577bcbb6.zip
chromium_src-a3c71e8edf494687af2e67bc8fe8b013577bcbb6.tar.gz
chromium_src-a3c71e8edf494687af2e67bc8fe8b013577bcbb6.tar.bz2
A few improvements to Blob handling.
* Break large blobs into multiple ipcs during creation. * Use shared memory blocks for the xfer. * Rename some methods and IPCs for readability. * Cap memory usage in the browser process at 1G. BUG=97221 Review URL: http://codereview.chromium.org/7974011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob/blob_url_request_job_unittest.cc')
-rw-r--r--webkit/blob/blob_url_request_job_unittest.cc15
1 files changed, 2 insertions, 13 deletions
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index e263ca9..07632db 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -317,13 +317,6 @@ class BlobURLRequestJobTest : public testing::Test {
TestErrorRequest(blob_data, 404);
}
- void TestGetSlicedDataRequest() {
- scoped_refptr<BlobData> blob_data(new BlobData());
- blob_data->AppendData(kTestData2, 2, 4);
- std::string result(kTestData2 + 2, 4);
- TestSuccessRequest(blob_data, result);
- }
-
void TestGetSlicedFileRequest() {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFile(temp_file1_, 2, 4, temp_file_modification_time1_);
@@ -333,9 +326,9 @@ class BlobURLRequestJobTest : public testing::Test {
scoped_refptr<BlobData> BuildComplicatedData(std::string* expected_result) {
scoped_refptr<BlobData> blob_data(new BlobData());
- blob_data->AppendData(kTestData1, 1, 2);
+ blob_data->AppendData(kTestData1 + 1, 2);
blob_data->AppendFile(temp_file1_, 2, 3, temp_file_modification_time1_);
- blob_data->AppendData(kTestData2, 3, 4);
+ blob_data->AppendData(kTestData2 + 3, 4);
blob_data->AppendFile(temp_file2_, 4, 5, temp_file_modification_time2_);
*expected_result = std::string(kTestData1 + 1, 2);
*expected_result += std::string(kTestFileData1 + 2, 3);
@@ -431,10 +424,6 @@ TEST_F(BlobURLRequestJobTest, TestGetLargeFileRequest) {
RunTestOnIOThread(&BlobURLRequestJobTest::TestGetLargeFileRequest);
}
-TEST_F(BlobURLRequestJobTest, TestGetSlicedDataRequest) {
- RunTestOnIOThread(&BlobURLRequestJobTest::TestGetSlicedDataRequest);
-}
-
TEST_F(BlobURLRequestJobTest, TestGetSlicedFileRequest) {
RunTestOnIOThread(&BlobURLRequestJobTest::TestGetSlicedFileRequest);
}