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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « chrome/browser/chromeos/drive/sync_client_unittest.cc ('k') | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
index 1392ac55c3a640dc63cb721c9b2debd827e04cc1..e453b3560d588c941734ebcf32240059d750c0a0 100644
--- a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
+++ b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
@@ -73,13 +73,12 @@ TEST_F(WebkitFileStreamReaderImplTest, ReadThenGetLength) {
const base::FilePath kDriveFile =
util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
- scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- base::Time())); // expected modification time
+ scoped_ptr<WebkitFileStreamReaderImpl> reader(new WebkitFileStreamReaderImpl(
+ GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ base::Time())); // expected modification time
std::string content;
ASSERT_EQ(net::OK, test_util::ReadAllData(reader.get(), &content));
@@ -94,13 +93,12 @@ TEST_F(WebkitFileStreamReaderImplTest, GetLengthThenRead) {
const base::FilePath kDriveFile =
util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
- scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- base::Time())); // expected modification time
+ scoped_ptr<WebkitFileStreamReaderImpl> reader(new WebkitFileStreamReaderImpl(
+ GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ base::Time())); // expected modification time
net::TestInt64CompletionCallback callback;
int64 length = reader->GetLength(callback.callback());
@@ -116,13 +114,12 @@ TEST_F(WebkitFileStreamReaderImplTest, ReadWithOffset) {
util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
const int kOffset = 5;
- scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- kOffset,
- base::Time())); // expected modification time
+ scoped_ptr<WebkitFileStreamReaderImpl> reader(new WebkitFileStreamReaderImpl(
+ GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ kOffset,
+ base::Time())); // expected modification time
std::string content;
ASSERT_EQ(net::OK, test_util::ReadAllData(reader.get(), &content));
@@ -137,13 +134,12 @@ TEST_F(WebkitFileStreamReaderImplTest, ReadError) {
const base::FilePath kDriveFile =
util::GetDriveMyDriveRootPath().AppendASCII("non-existing.txt");
- scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- base::Time())); // expected modification time
+ scoped_ptr<WebkitFileStreamReaderImpl> reader(new WebkitFileStreamReaderImpl(
+ GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ base::Time())); // expected modification time
const int kBufferSize = 10;
scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(kBufferSize));
@@ -157,13 +153,12 @@ TEST_F(WebkitFileStreamReaderImplTest, GetLengthError) {
const base::FilePath kDriveFile =
util::GetDriveMyDriveRootPath().AppendASCII("non-existing.txt");
- scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- base::Time())); // expected modification time
+ scoped_ptr<WebkitFileStreamReaderImpl> reader(new WebkitFileStreamReaderImpl(
+ GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ base::Time())); // expected modification time
net::TestInt64CompletionCallback callback;
int64 result = reader->GetLength(callback.callback());
@@ -179,12 +174,11 @@ TEST_F(WebkitFileStreamReaderImplTest, LastModification) {
ASSERT_TRUE(google_apis::util::GetTimeFromString(
"2011-12-14T00:40:47.330Z", &expected_modification_time));
scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- expected_modification_time));
+ new WebkitFileStreamReaderImpl(GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ expected_modification_time));
net::TestInt64CompletionCallback callback;
int64 result = reader->GetLength(callback.callback());
@@ -200,12 +194,11 @@ TEST_F(WebkitFileStreamReaderImplTest, LastModificationError) {
util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
scoped_ptr<WebkitFileStreamReaderImpl> reader(
- new WebkitFileStreamReaderImpl(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy(),
- kDriveFile,
- 0, // offset
- base::Time::FromInternalValue(1)));
+ new WebkitFileStreamReaderImpl(GetFileSystemGetter(),
+ worker_thread_->message_loop_proxy().get(),
+ kDriveFile,
+ 0, // offset
+ base::Time::FromInternalValue(1)));
net::TestInt64CompletionCallback callback;
int64 result = reader->GetLength(callback.callback());
« no previous file with comments | « chrome/browser/chromeos/drive/sync_client_unittest.cc ('k') | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698