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

Unified Diff: chrome/browser/chromeos/drive/drive_file_stream_reader_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
Index: chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
index c0c3de12d7e17979e8b329c0aa4c0a9d8c93abe4..2f4b1fb5f60be4f6be4194abed878398edb1de36 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -63,7 +63,7 @@ class LocalReaderProxyTest : public ::testing::Test {
TEST_F(LocalReaderProxyTest, Read) {
// Open the file first.
scoped_ptr<util::LocalFileReader> file_reader(
- new util::LocalFileReader(worker_thread_->message_loop_proxy()));
+ new util::LocalFileReader(worker_thread_->message_loop_proxy().get()));
net::TestCompletionCallback callback;
file_reader->Open(file_path_, 0, callback.callback());
ASSERT_EQ(net::OK, callback.WaitForResult());
@@ -84,7 +84,7 @@ TEST_F(LocalReaderProxyTest, ReadWithLimit) {
// Open the file first.
scoped_ptr<util::LocalFileReader> file_reader(
- new util::LocalFileReader(worker_thread_->message_loop_proxy()));
+ new util::LocalFileReader(worker_thread_->message_loop_proxy().get()));
net::TestCompletionCallback callback;
file_reader->Open(file_path_, 0, callback.callback());
ASSERT_EQ(net::OK, callback.WaitForResult());
@@ -330,8 +330,7 @@ TEST_F(DriveFileStreamReaderTest, Read) {
// Create the reader, and initialize it.
// In this case, the file is not yet locally cached.
scoped_ptr<DriveFileStreamReader> reader(new DriveFileStreamReader(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy()));
+ GetFileSystemGetter(), worker_thread_->message_loop_proxy().get()));
EXPECT_FALSE(reader->IsInitialized());
int error = net::ERR_FAILED;
@@ -358,9 +357,8 @@ TEST_F(DriveFileStreamReaderTest, Read) {
// Create second instance and initialize it.
// In this case, the file should be cached one.
- reader.reset(
- new DriveFileStreamReader(GetFileSystemGetter(),
- worker_thread_->message_loop_proxy()));
+ reader.reset(new DriveFileStreamReader(
+ GetFileSystemGetter(), worker_thread_->message_loop_proxy().get()));
EXPECT_FALSE(reader->IsInitialized());
error = net::ERR_FAILED;
@@ -400,8 +398,7 @@ TEST_F(DriveFileStreamReaderTest, ReadRange) {
// Create the reader, and initialize it.
// In this case, the file is not yet locally cached.
scoped_ptr<DriveFileStreamReader> reader(new DriveFileStreamReader(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy()));
+ GetFileSystemGetter(), worker_thread_->message_loop_proxy().get()));
EXPECT_FALSE(reader->IsInitialized());
int error = net::ERR_FAILED;
@@ -433,9 +430,8 @@ TEST_F(DriveFileStreamReaderTest, ReadRange) {
// Create second instance and initialize it.
// In this case, the file should be cached one.
- reader.reset(
- new DriveFileStreamReader(GetFileSystemGetter(),
- worker_thread_->message_loop_proxy()));
+ reader.reset(new DriveFileStreamReader(
+ GetFileSystemGetter(), worker_thread_->message_loop_proxy().get()));
EXPECT_FALSE(reader->IsInitialized());
error = net::ERR_FAILED;
@@ -471,8 +467,7 @@ TEST_F(DriveFileStreamReaderTest, OutOfRangeError) {
// Create the reader, and initialize it.
// In this case, the file is not yet locally cached.
scoped_ptr<DriveFileStreamReader> reader(new DriveFileStreamReader(
- GetFileSystemGetter(),
- worker_thread_->message_loop_proxy()));
+ GetFileSystemGetter(), worker_thread_->message_loop_proxy().get()));
EXPECT_FALSE(reader->IsInitialized());
int error = net::ERR_FAILED;

Powered by Google App Engine
This is Rietveld 408576698