Reland "Add thread checking to RunLoop, deprecate MessageLoopRunner. (patchset #4 id:20002 of https…

chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
@@ skipping 55 matching lines @@
                         SyncStatusCode status,
                         typename AssignTrait<R>::ArgumentType value) {
   DCHECK(status_out);
   DCHECK(value_out);
   DCHECK(run_loop);
   *status_out = status;
   *value_out = value;
   run_loop->Quit();
 }
 
-// This is called on IO thread.
-void VerifyFileError(base::RunLoop* run_loop,
+// This is called on IO thread. Posts |callback| to be called on UI thread.
+void VerifyFileError(base::Closure callback,
                      base::File::Error error) {
-  DCHECK(run_loop);
   EXPECT_EQ(base::File::FILE_OK, error);
-  run_loop->Quit();
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 
 }  // namespace
 
 class MockSyncEventObserver : public SyncEventObserver {
  public:
   MockSyncEventObserver() {}
   virtual ~MockSyncEventObserver() {}
 
   MOCK_METHOD3(OnSyncStateUpdated,
@@ skipping 331 matching lines @@
   mock_remote_service()->NotifyRemoteChangeQueueUpdated(1);
 
   // Start a local operation on the same file (to make it BUSY).
   base::RunLoop verify_file_error_run_loop;
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&CannedSyncableFileSystem::DoCreateFile,
                  base::Unretained(file_system_.get()),
                  kFile, base::Bind(&VerifyFileError,
-                                   &verify_file_error_run_loop)));
+                                   verify_file_error_run_loop.QuitClosure())));
 
   run_loop.Run();
 
   mock_remote_service()->NotifyRemoteChangeQueueUpdated(0);
 
   verify_file_error_run_loop.Run();
 }
 
 #if defined(THREAD_SANITIZER)
 // SyncFileSystemServiceTest.GetFileSyncStatus fails under ThreadSanitizer,
@@ skipping 37 matching lines @@
         base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(SYNC_STATUS_OK, status);
     EXPECT_EQ(SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status);
   }
 }
 
 }  // namespace sync_file_system