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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/blob/blob_url_request_job_unittest.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months 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
« no previous file with comments | « webkit/blob/blob_url_request_job.cc ('k') | webkit/blob/local_file_stream_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/blob/blob_url_request_job_unittest.cc
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 0c6016202476116a9535f3a724a6f9bdfd0015c0..6834fd246bff4165c2548a148cae252543a02e97 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -201,7 +201,7 @@ class BlobURLRequestJobTest : public testing::Test {
fileapi::FileSystemFileUtil* file_util =
file_system_context_->GetFileUtil(kFileSystemType);
- fileapi::FileSystemOperationContext context(file_system_context_);
+ fileapi::FileSystemOperationContext context(file_system_context_.get());
context.set_allowed_bytes_growth(1024);
base::PlatformFile handle = base::kInvalidPlatformFileValue;
@@ -261,8 +261,8 @@ class BlobURLRequestJobTest : public testing::Test {
request_.get(),
empty_context_.network_delegate(),
blob_data,
- file_system_context_,
- base::MessageLoopProxy::current());
+ file_system_context_.get(),
+ base::MessageLoopProxy::current().get());
// Start the request.
if (!extra_headers.IsEmpty())
@@ -325,13 +325,13 @@ BlobURLRequestJob* BlobURLRequestJobTest::blob_url_request_job_ = NULL;
TEST_F(BlobURLRequestJobTest, TestGetSimpleDataRequest) {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendData(kTestData1);
- TestSuccessRequest(blob_data, kTestData1);
+ TestSuccessRequest(blob_data.get(), kTestData1);
}
TEST_F(BlobURLRequestJobTest, TestGetSimpleFileRequest) {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFile(temp_file1_, 0, -1, base::Time());
- TestSuccessRequest(blob_data, kTestFileData1);
+ TestSuccessRequest(blob_data.get(), kTestFileData1);
}
TEST_F(BlobURLRequestJobTest, TestGetLargeFileRequest) {
@@ -345,7 +345,7 @@ TEST_F(BlobURLRequestJobTest, TestGetLargeFileRequest) {
file_util::WriteFile(large_temp_file, large_data.data(),
large_data.size()));
blob_data->AppendFile(large_temp_file, 0, -1, base::Time());
- TestSuccessRequest(blob_data, large_data);
+ TestSuccessRequest(blob_data.get(), large_data);
}
TEST_F(BlobURLRequestJobTest, TestGetNonExistentFileRequest) {
@@ -353,7 +353,7 @@ TEST_F(BlobURLRequestJobTest, TestGetNonExistentFileRequest) {
temp_file1_.InsertBeforeExtension(FILE_PATH_LITERAL("-na"));
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFile(non_existent_file, 0, -1, base::Time());
- TestErrorRequest(blob_data, 404);
+ TestErrorRequest(blob_data.get(), 404);
}
TEST_F(BlobURLRequestJobTest, TestGetChangedFileRequest) {
@@ -361,14 +361,14 @@ TEST_F(BlobURLRequestJobTest, TestGetChangedFileRequest) {
base::Time old_time =
temp_file_modification_time1_ - base::TimeDelta::FromSeconds(10);
blob_data->AppendFile(temp_file1_, 0, 3, old_time);
- TestErrorRequest(blob_data, 404);
+ TestErrorRequest(blob_data.get(), 404);
}
TEST_F(BlobURLRequestJobTest, TestGetSlicedFileRequest) {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFile(temp_file1_, 2, 4, temp_file_modification_time1_);
std::string result(kTestFileData1 + 2, 4);
- TestSuccessRequest(blob_data, result);
+ TestSuccessRequest(blob_data.get(), result);
}
TEST_F(BlobURLRequestJobTest, TestGetSimpleFileSystemFileRequest) {
@@ -376,7 +376,7 @@ TEST_F(BlobURLRequestJobTest, TestGetSimpleFileSystemFileRequest) {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFileSystemFile(temp_file_system_file1_, 0, -1,
base::Time());
- TestSuccessRequest(blob_data, kTestFileSystemFileData1);
+ TestSuccessRequest(blob_data.get(), kTestFileSystemFileData1);
}
TEST_F(BlobURLRequestJobTest, TestGetLargeFileSystemFileRequest) {
@@ -392,7 +392,7 @@ TEST_F(BlobURLRequestJobTest, TestGetLargeFileSystemFileRequest) {
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFileSystemFile(GetFileSystemURL(kFilename),
0, -1, base::Time());
- TestSuccessRequest(blob_data, large_data);
+ TestSuccessRequest(blob_data.get(), large_data);
}
TEST_F(BlobURLRequestJobTest, TestGetNonExistentFileSystemFileRequest) {
@@ -400,7 +400,7 @@ TEST_F(BlobURLRequestJobTest, TestGetNonExistentFileSystemFileRequest) {
GURL non_existent_file = GetFileSystemURL("non-existent.dat");
scoped_refptr<BlobData> blob_data(new BlobData());
blob_data->AppendFileSystemFile(non_existent_file, 0, -1, base::Time());
- TestErrorRequest(blob_data, 404);
+ TestErrorRequest(blob_data.get(), 404);
}
TEST_F(BlobURLRequestJobTest, TestGetChangedFileSystemFileRequest) {
@@ -410,7 +410,7 @@ TEST_F(BlobURLRequestJobTest, TestGetChangedFileSystemFileRequest) {
temp_file_system_file_modification_time1_ -
base::TimeDelta::FromSeconds(10);
blob_data->AppendFileSystemFile(temp_file_system_file1_, 0, 3, old_time);
- TestErrorRequest(blob_data, 404);
+ TestErrorRequest(blob_data.get(), 404);
}
TEST_F(BlobURLRequestJobTest, TestGetSlicedFileSystemFileRequest) {
@@ -419,14 +419,14 @@ TEST_F(BlobURLRequestJobTest, TestGetSlicedFileSystemFileRequest) {
blob_data->AppendFileSystemFile(temp_file_system_file1_, 2, 4,
temp_file_system_file_modification_time1_);
std::string result(kTestFileSystemFileData1 + 2, 4);
- TestSuccessRequest(blob_data, result);
+ TestSuccessRequest(blob_data.get(), result);
}
TEST_F(BlobURLRequestJobTest, TestGetComplicatedDataAndFileRequest) {
SetUpFileSystem();
std::string result;
scoped_refptr<BlobData> blob_data = BuildComplicatedData(&result);
- TestSuccessRequest(blob_data, result);
+ TestSuccessRequest(blob_data.get(), result);
}
TEST_F(BlobURLRequestJobTest, TestGetRangeRequest1) {
@@ -437,7 +437,7 @@ TEST_F(BlobURLRequestJobTest, TestGetRangeRequest1) {
extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=5-10");
expected_status_code_ = 206;
expected_response_ = result.substr(5, 10 - 5 + 1);
- TestRequest("GET", extra_headers, blob_data);
+ TestRequest("GET", extra_headers, blob_data.get());
}
TEST_F(BlobURLRequestJobTest, TestGetRangeRequest2) {
@@ -448,7 +448,7 @@ TEST_F(BlobURLRequestJobTest, TestGetRangeRequest2) {
extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=-10");
expected_status_code_ = 206;
expected_response_ = result.substr(result.length() - 10);
- TestRequest("GET", extra_headers, blob_data);
+ TestRequest("GET", extra_headers, blob_data.get());
}
TEST_F(BlobURLRequestJobTest, TestExtraHeaders) {
@@ -458,7 +458,7 @@ TEST_F(BlobURLRequestJobTest, TestExtraHeaders) {
blob_data->AppendData(kTestData1);
expected_status_code_ = 200;
expected_response_ = kTestData1;
- TestRequest("GET", net::HttpRequestHeaders(), blob_data);
+ TestRequest("GET", net::HttpRequestHeaders(), blob_data.get());
std::string content_type;
EXPECT_TRUE(request_->response_headers()->GetMimeType(&content_type));
« no previous file with comments | « webkit/blob/blob_url_request_job.cc ('k') | webkit/blob/local_file_stream_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698