Replace base::MessageLoop(TYPE_IO) with MessageLoopForIO.

This is the remaining clean up of testing code.

BUG=None
TEST=Ran content_unittests

Review URL: https://codereview.chromium.org/24981003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225942 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 24 insertions, 36 deletions

diff --git a/webkit/browser/blob/blob_url_request_job_unittest.cc b/webkit/browser/blob/blob_url_request_job_unittest.cc
index 8a814f5..e2bc55e 100644
--- a/webkit/browser/blob/blob_url_request_job_unittest.cc
+++ b/webkit/browser/blob/blob_url_request_job_unittest.cc
@@ -133,8 +133,7 @@ class BlobURLRequestJobTest : public testing::Test {
   };
 
   BlobURLRequestJobTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        blob_data_(new BlobData()),
+      : blob_data_(new BlobData()),
         expected_status_code_(0) {}
 
   virtual void SetUp() {
@@ -283,7 +282,7 @@ class BlobURLRequestJobTest : public testing::Test {
   base::Time temp_file_system_file_modification_time1_;
   base::Time temp_file_system_file_modification_time2_;
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   scoped_refptr<BlobData> blob_data_;
   net::URLRequestJobFactoryImpl url_request_job_factory_;
diff --git a/webkit/browser/blob/local_file_stream_reader_unittest.cc b/webkit/browser/blob/local_file_stream_reader_unittest.cc
index 86a3c3d..501d62f7 100644
--- a/webkit/browser/blob/local_file_stream_reader_unittest.cc
+++ b/webkit/browser/blob/local_file_stream_reader_unittest.cc
@@ -60,8 +60,7 @@ void QuitLoop() {
 class LocalFileStreamReaderTest : public testing::Test {
  public:
   LocalFileStreamReaderTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        file_thread_("FileUtilProxyTestFileThread") {}
+      : file_thread_("FileUtilProxyTestFileThread") {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(file_thread_.Start());
@@ -117,7 +116,7 @@ class LocalFileStreamReaderTest : public testing::Test {
   }
 
  private:
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   base::Thread file_thread_;
   base::ScopedTempDir dir_;
   base::Time test_file_modification_time_;
diff --git a/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
index 804fd86..5c97f64 100644
--- a/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -163,8 +163,7 @@ class CopyOrMoveOperationTestHelper {
       FileSystemType dest_type)
       : origin_(origin),
         src_type_(src_type),
-        dest_type_(dest_type),
-        message_loop_(base::MessageLoop::TYPE_IO) {}
+        dest_type_(dest_type) {}
 
   ~CopyOrMoveOperationTestHelper() {
     file_system_context_ = NULL;
@@ -378,7 +377,7 @@ class CopyOrMoveOperationTestHelper {
   const FileSystemType src_type_;
   const FileSystemType dest_type_;
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   scoped_refptr<FileSystemContext> file_system_context_;
   scoped_refptr<quota::MockQuotaManagerProxy> quota_manager_proxy_;
   scoped_refptr<quota::MockQuotaManager> quota_manager_;
@@ -714,7 +713,7 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelper) {
   // LocalFileWriter requires the file exists. So create an empty file here.
   file_util::WriteFile(dest_path, "", 0);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   base::Thread file_thread("file_thread");
   ASSERT_TRUE(file_thread.Start());
   ScopedThreadStopper thread_stopper(&file_thread);
@@ -767,7 +766,7 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelper_Cancel) {
   // LocalFileWriter requires the file exists. So create an empty file here.
   file_util::WriteFile(dest_path, "", 0);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   base::Thread file_thread("file_thread");
   ASSERT_TRUE(file_thread.Start());
   ScopedThreadStopper thread_stopper(&file_thread);
diff --git a/webkit/browser/fileapi/dragged_file_util_unittest.cc b/webkit/browser/fileapi/dragged_file_util_unittest.cc
index f4c029b..9bb00c9 100644
--- a/webkit/browser/fileapi/dragged_file_util_unittest.cc
+++ b/webkit/browser/fileapi/dragged_file_util_unittest.cc
@@ -89,8 +89,7 @@ FileSystemURL GetOtherURL(FileSystemContext* file_system_context,
 
 class DraggedFileUtilTest : public testing::Test {
  public:
-  DraggedFileUtilTest()
-      : message_loop_(base::MessageLoop::TYPE_IO) {}
+  DraggedFileUtilTest() {}
 
   virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
@@ -276,7 +275,7 @@ class DraggedFileUtilTest : public testing::Test {
 
   base::ScopedTempDir data_dir_;
   base::ScopedTempDir partition_dir_;
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   std::string filesystem_id_;
   scoped_refptr<FileSystemContext> file_system_context_;
   std::map<base::FilePath, base::FilePath> toplevel_root_map_;
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
index e43ee4d..5109a01 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -42,8 +42,7 @@ static const char kFileSystemURLPrefix[] =
 class FileSystemDirURLRequestJobTest : public testing::Test {
  protected:
   FileSystemDirURLRequestJobTest()
-    : message_loop_(base::MessageLoop::TYPE_IO),  // simulate an IO thread
-      weak_factory_(this) {
+    : weak_factory_(this) {
   }
 
   virtual void SetUp() OVERRIDE {
@@ -212,7 +211,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
   // Put the message loop at the top, so that it's the last thing deleted.
   // Delete all MessageLoopProxy objects before the MessageLoop, to help prevent
   // leaks caused by tasks posted during shutdown.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
 
   base::ScopedTempDir temp_dir_;
   net::URLRequestContext empty_context_;
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc b/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc
index 0ce5658..67ca0ab 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc
+++ b/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc
@@ -60,8 +60,7 @@ void NeverCalled(int unused) { ADD_FAILURE(); }
 
 class FileSystemFileStreamReaderTest : public testing::Test {
  public:
-  FileSystemFileStreamReaderTest()
-      : message_loop_(base::MessageLoop::TYPE_IO) {}
+  FileSystemFileStreamReaderTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -130,7 +129,7 @@ class FileSystemFileStreamReaderTest : public testing::Test {
         base::FilePath().AppendASCII(file_name));
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<FileSystemContext> file_system_context_;
   base::Time test_file_modification_time_;
diff --git a/webkit/browser/fileapi/file_system_operation_impl_write_unittest.cc b/webkit/browser/fileapi/file_system_operation_impl_write_unittest.cc
index 7fb9aa4..3af746f 100644
--- a/webkit/browser/fileapi/file_system_operation_impl_write_unittest.cc
+++ b/webkit/browser/fileapi/file_system_operation_impl_write_unittest.cc
@@ -51,8 +51,7 @@ class FileSystemOperationImplWriteTest
     : public testing::Test {
  public:
   FileSystemOperationImplWriteTest()
-      : loop_(base::MessageLoop::TYPE_IO),
-        status_(base::PLATFORM_FILE_OK),
+      : status_(base::PLATFORM_FILE_OK),
         cancel_status_(base::PLATFORM_FILE_ERROR_FAILED),
         bytes_written_(0),
         complete_(false),
@@ -152,7 +151,7 @@ class FileSystemOperationImplWriteTest
   scoped_refptr<FileSystemContext> file_system_context_;
   scoped_refptr<quota::MockQuotaManager> quota_manager_;
 
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
 
   base::ScopedTempDir dir_;
   base::FilePath virtual_path_;
diff --git a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
index 8f54e62..196a4f2 100644
--- a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -50,9 +50,7 @@ void FillBuffer(char* buffer, size_t len) {
 
 class FileSystemURLRequestJobTest : public testing::Test {
  protected:
-  FileSystemURLRequestJobTest()
-    : message_loop_(base::MessageLoop::TYPE_IO),  // simulate an IO thread
-      weak_factory_(this) {
+  FileSystemURLRequestJobTest() : weak_factory_(this) {
   }
 
   virtual void SetUp() OVERRIDE {
@@ -173,7 +171,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
   }
 
   // Put the message loop at the top, so that it's the last thing deleted.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
 
   base::ScopedTempDir temp_dir_;
   scoped_refptr<FileSystemContext> file_system_context_;
diff --git a/webkit/browser/fileapi/file_writer_delegate_unittest.cc b/webkit/browser/fileapi/file_writer_delegate_unittest.cc
index 28c93e8..22c8d6d 100644
--- a/webkit/browser/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/browser/fileapi/file_writer_delegate_unittest.cc
@@ -72,8 +72,7 @@ class Result {
 
 class FileWriterDelegateTest : public PlatformTest {
  public:
-  FileWriterDelegateTest()
-      : loop_(base::MessageLoop::TYPE_IO) {}
+  FileWriterDelegateTest() {}
 
  protected:
   virtual void SetUp() OVERRIDE;
@@ -136,7 +135,7 @@ class FileWriterDelegateTest : public PlatformTest {
   static net::URLRequest::ProtocolFactory Factory;
 
   // This should be alive until the very end of this instance.
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
 
   scoped_refptr<FileSystemContext> file_system_context_;
 
diff --git a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
index cf3c06a..96bccf6 100644
--- a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
+++ b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
@@ -23,8 +23,7 @@ namespace fileapi {
 class LocalFileStreamWriterTest : public testing::Test {
  public:
   LocalFileStreamWriterTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        file_thread_("FileUtilProxyTestFileThread") {}
+      : file_thread_("FileUtilProxyTestFileThread") {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(file_thread_.Start());
@@ -85,7 +84,7 @@ class LocalFileStreamWriterTest : public testing::Test {
   }
 
  private:
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   base::Thread file_thread_;
   base::ScopedTempDir temp_dir_;
 };
diff --git a/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc b/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
index 429edf2..6fd7964 100644
--- a/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
+++ b/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
@@ -28,8 +28,7 @@ const fileapi::FileSystemType kFileSystemType =
 
 class UploadFileSystemFileElementReaderTest : public testing::Test {
  public:
-  UploadFileSystemFileElementReaderTest()
-      : message_loop_(base::MessageLoop::TYPE_IO) {}
+  UploadFileSystemFileElementReaderTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -108,7 +107,7 @@ class UploadFileSystemFileElementReaderTest : public testing::Test {
     file_system_root_url_ = root;
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<FileSystemContext> file_system_context_;
   GURL file_system_root_url_;