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 e316a8f4e394b40b9c89902b6118217232f5722f..8a6e08d4a48beed81135e1240f4fffc4004d7f01 100644 |
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc |
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc |
@@ -9,8 +9,8 @@ |
#include "base/bind.h" |
#include "base/files/file_path.h" |
#include "base/files/scoped_temp_dir.h" |
-#include "base/message_loop.h" |
#include "base/rand_util.h" |
hashimoto
2013/06/20 04:45:42
nit: Do we need to include this?
kinaba
2013/06/20 04:58:30
Done.
|
+#include "base/run_loop.h" |
#include "base/sequenced_task_runner.h" |
#include "base/threading/thread.h" |
#include "chrome/browser/chromeos/drive/fake_file_system.h" |
@@ -343,14 +343,16 @@ TEST_F(DriveFileStreamReaderTest, Read) { |
int error = net::ERR_FAILED; |
scoped_ptr<ResourceEntry> entry; |
- reader->Initialize( |
- kDriveFile, |
- net::HttpByteRange(), |
- google_apis::CreateComposedCallback( |
- base::Bind(&google_apis::test_util::RunAndQuit), |
- google_apis::test_util::CreateCopyResultCallback( |
- &error, &entry))); |
- base::MessageLoop::current()->Run(); |
+ { |
+ base::RunLoop run_loop; |
+ reader->Initialize( |
+ kDriveFile, |
+ net::HttpByteRange(), |
+ google_apis::test_util::CreateQuitCallback( |
+ &run_loop, |
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry))); |
+ run_loop.Run(); |
+ } |
EXPECT_EQ(net::OK, error); |
ASSERT_TRUE(entry); |
EXPECT_TRUE(reader->IsInitialized()); |
@@ -370,14 +372,16 @@ TEST_F(DriveFileStreamReaderTest, Read) { |
error = net::ERR_FAILED; |
entry.reset(); |
- reader->Initialize( |
- kDriveFile, |
- net::HttpByteRange(), |
- google_apis::CreateComposedCallback( |
- base::Bind(&google_apis::test_util::RunAndQuit), |
- google_apis::test_util::CreateCopyResultCallback( |
- &error, &entry))); |
- base::MessageLoop::current()->Run(); |
+ { |
+ base::RunLoop run_loop; |
+ reader->Initialize( |
+ kDriveFile, |
+ net::HttpByteRange(), |
+ google_apis::test_util::CreateQuitCallback( |
+ &run_loop, |
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry))); |
+ run_loop.Run(); |
+ } |
EXPECT_EQ(net::OK, error); |
ASSERT_TRUE(entry); |
EXPECT_TRUE(reader->IsInitialized()); |
@@ -413,14 +417,16 @@ TEST_F(DriveFileStreamReaderTest, ReadRange) { |
byte_range.set_first_byte_position(kRangeOffset); |
// Last byte position is inclusive. |
byte_range.set_last_byte_position(kRangeOffset + kRangeLength - 1); |
- reader->Initialize( |
- kDriveFile, |
- byte_range, |
- google_apis::CreateComposedCallback( |
- base::Bind(&google_apis::test_util::RunAndQuit), |
- google_apis::test_util::CreateCopyResultCallback( |
- &error, &entry))); |
- base::MessageLoop::current()->Run(); |
+ { |
+ base::RunLoop run_loop; |
+ reader->Initialize( |
+ kDriveFile, |
+ byte_range, |
+ google_apis::test_util::CreateQuitCallback( |
+ &run_loop, |
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry))); |
+ run_loop.Run(); |
+ } |
EXPECT_EQ(net::OK, error); |
ASSERT_TRUE(entry); |
EXPECT_TRUE(reader->IsInitialized()); |
@@ -441,14 +447,16 @@ TEST_F(DriveFileStreamReaderTest, ReadRange) { |
error = net::ERR_FAILED; |
entry.reset(); |
- reader->Initialize( |
- kDriveFile, |
- byte_range, |
- google_apis::CreateComposedCallback( |
- base::Bind(&google_apis::test_util::RunAndQuit), |
- google_apis::test_util::CreateCopyResultCallback( |
- &error, &entry))); |
- base::MessageLoop::current()->Run(); |
+ { |
+ base::RunLoop run_loop; |
+ reader->Initialize( |
+ kDriveFile, |
+ byte_range, |
+ google_apis::test_util::CreateQuitCallback( |
+ &run_loop, |
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry))); |
+ run_loop.Run(); |
+ } |
EXPECT_EQ(net::OK, error); |
ASSERT_TRUE(entry); |
EXPECT_TRUE(reader->IsInitialized()); |
@@ -480,14 +488,16 @@ TEST_F(DriveFileStreamReaderTest, OutOfRangeError) { |
byte_range.set_first_byte_position(kRangeOffset); |
// Last byte position is inclusive. |
byte_range.set_last_byte_position(kRangeOffset + kRangeLength - 1); |
- reader->Initialize( |
- kDriveFile, |
- byte_range, |
- google_apis::CreateComposedCallback( |
- base::Bind(&google_apis::test_util::RunAndQuit), |
- google_apis::test_util::CreateCopyResultCallback( |
- &error, &entry))); |
- base::MessageLoop::current()->Run(); |
+ { |
+ base::RunLoop run_loop; |
+ reader->Initialize( |
+ kDriveFile, |
+ byte_range, |
+ google_apis::test_util::CreateQuitCallback( |
+ &run_loop, |
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry))); |
+ run_loop.Run(); |
+ } |
EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, error); |
EXPECT_FALSE(entry); |
} |