Clean up ARC file system unit tests.

chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_unittest.cc

Index: chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_unittest.cc
diff --git a/chrome/browser/chromeos/arc/fileapi/arc_deferred_file_system_operation_runner_unittest.cc b/chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_unittest.cc
similarity index 70%
rename from chrome/browser/chromeos/arc/fileapi/arc_deferred_file_system_operation_runner_unittest.cc
rename to chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_unittest.cc
index b34a476d2fcaa64123a1eade61651ca33cf26af7..76eed199f7c7e73d2ac99dd9e4157743f795989d 100644
--- a/chrome/browser/chromeos/arc/fileapi/arc_deferred_file_system_operation_runner_unittest.cc
+++ b/chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_unittest.cc
@@ -10,11 +10,10 @@
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/arc/fileapi/arc_deferred_file_system_operation_runner.h"
+#include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/common/file_system.mojom.h"
-#include "components/arc/file_system/arc_file_system_operation_runner.h"
 #include "components/arc/test/fake_file_system_instance.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -30,44 +29,41 @@ constexpr char kUrl[] = "content://test";
 
 }  // namespace
 
-class ArcDeferredFileSystemOperationRunnerTest : public testing::Test {
+class ArcFileSystemOperationRunnerTest : public testing::Test {
  public:
-  ArcDeferredFileSystemOperationRunnerTest() = default;
-  ~ArcDeferredFileSystemOperationRunnerTest() override = default;
+  ArcFileSystemOperationRunnerTest() = default;
+  ~ArcFileSystemOperationRunnerTest() override = default;
 
   void SetUp() override {
     arc_service_manager_ = base::MakeUnique<ArcServiceManager>(nullptr);
     arc_service_manager_->arc_bridge_service()->file_system()->SetInstance(
         &file_system_instance_);
-    // We can not use base::MakeUnique() for friend constructors.
     arc_service_manager_->AddService(
-        base::WrapUnique(new ArcDeferredFileSystemOperationRunner(
-            arc_service_manager_->arc_bridge_service(),
-            false /* observe_events */)));
-    deferred_runner_ = static_cast<ArcDeferredFileSystemOperationRunner*>(
-        arc_service_manager_->GetService<ArcFileSystemOperationRunner>());
+        base::WrapUnique(ArcFileSystemOperationRunner::CreateForTesting(
+            arc_service_manager_->arc_bridge_service())));
+    runner_ = arc_service_manager_->GetService<ArcFileSystemOperationRunner>();
   }
 
  protected:
-  // Calls private ArcDeferredFileSystemOperationRunner::SetShouldDefer().
+  // Calls private ArcFileSystemOperationRunner::SetShouldDefer().
   void CallSetShouldDefer(bool should_defer) {
-    deferred_runner_->SetShouldDefer(should_defer);
+    runner_->SetShouldDefer(should_defer);
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   FakeFileSystemInstance file_system_instance_;
   std::unique_ptr<ArcServiceManager> arc_service_manager_;
   // Owned by |arc_service_manager_|.
-  ArcDeferredFileSystemOperationRunner* deferred_runner_;
+  ArcFileSystemOperationRunner* runner_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ArcDeferredFileSystemOperationRunnerTest);
+  DISALLOW_COPY_AND_ASSIGN(ArcFileSystemOperationRunnerTest);
 };
 
-TEST_F(ArcDeferredFileSystemOperationRunnerTest, RunImmediately) {
+TEST_F(ArcFileSystemOperationRunnerTest, RunImmediately) {
   int counter = 0;
   CallSetShouldDefer(false);
-  deferred_runner_->GetChildDocuments(
+  runner_->GetChildDocuments(
       kAuthority, kDocumentId,
       base::Bind(
           [](int* counter,
@@ -75,14 +71,14 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, RunImmediately) {
             ++*counter;
           },
           &counter));
-  deferred_runner_->GetDocument(
+  runner_->GetDocument(
       kAuthority, kDocumentId,
       base::Bind([](int* counter, mojom::DocumentPtr document) { ++*counter; },
                  &counter));
-  deferred_runner_->GetFileSize(
+  runner_->GetFileSize(
       GURL(kUrl),
       base::Bind([](int* counter, int64_t size) { ++*counter; }, &counter));
-  deferred_runner_->OpenFileToRead(
+  runner_->OpenFileToRead(
       GURL(kUrl),
       base::Bind([](int* counter, mojo::ScopedHandle handle) { ++*counter; },
                  &counter));
@@ -90,10 +86,10 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, RunImmediately) {
   EXPECT_EQ(4, counter);
 }
 
-TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndRun) {
+TEST_F(ArcFileSystemOperationRunnerTest, DeferAndRun) {
   int counter = 0;
   CallSetShouldDefer(true);
-  deferred_runner_->GetChildDocuments(
+  runner_->GetChildDocuments(
       kAuthority, kDocumentId,
       base::Bind(
           [](int* counter,
@@ -101,14 +97,14 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndRun) {
             ++*counter;
           },
           &counter));
-  deferred_runner_->GetDocument(
+  runner_->GetDocument(
       kAuthority, kDocumentId,
       base::Bind([](int* counter, mojom::DocumentPtr document) { ++*counter; },
                  &counter));
-  deferred_runner_->GetFileSize(
+  runner_->GetFileSize(
       GURL(kUrl),
       base::Bind([](int* counter, int64_t size) { ++*counter; }, &counter));
-  deferred_runner_->OpenFileToRead(
+  runner_->OpenFileToRead(
       GURL(kUrl),
       base::Bind([](int* counter, mojo::ScopedHandle handle) { ++*counter; },
                  &counter));
@@ -120,10 +116,10 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndRun) {
   EXPECT_EQ(4, counter);
 }
 
-TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndDiscard) {
+TEST_F(ArcFileSystemOperationRunnerTest, DeferAndDiscard) {
   int counter = 0;
   CallSetShouldDefer(true);
-  deferred_runner_->GetChildDocuments(
+  runner_->GetChildDocuments(
       kAuthority, kDocumentId,
       base::Bind(
           [](int* counter,
@@ -131,14 +127,14 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndDiscard) {
             ++*counter;
           },
           &counter));
-  deferred_runner_->GetDocument(
+  runner_->GetDocument(
       kAuthority, kDocumentId,
       base::Bind([](int* counter, mojom::DocumentPtr document) { ++*counter; },
                  &counter));
-  deferred_runner_->GetFileSize(
+  runner_->GetFileSize(
       GURL(kUrl),
       base::Bind([](int* counter, int64_t size) { ++*counter; }, &counter));
-  deferred_runner_->OpenFileToRead(
+  runner_->OpenFileToRead(
       GURL(kUrl),
       base::Bind([](int* counter, mojo::ScopedHandle handle) { ++*counter; },
                  &counter));
@@ -150,13 +146,13 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, DeferAndDiscard) {
   EXPECT_EQ(0, counter);
 }
 
-TEST_F(ArcDeferredFileSystemOperationRunnerTest, FileInstanceUnavailable) {
+TEST_F(ArcFileSystemOperationRunnerTest, FileInstanceUnavailable) {
   arc_service_manager_->arc_bridge_service()->file_system()->SetInstance(
       nullptr);
 
   int counter = 0;
   CallSetShouldDefer(false);
-  deferred_runner_->GetChildDocuments(
+  runner_->GetChildDocuments(
       kAuthority, kDocumentId,
       base::Bind(
           [](int* counter,
@@ -164,14 +160,14 @@ TEST_F(ArcDeferredFileSystemOperationRunnerTest, FileInstanceUnavailable) {
             ++*counter;
           },
           &counter));
-  deferred_runner_->GetDocument(
+  runner_->GetDocument(
       kAuthority, kDocumentId,
       base::Bind([](int* counter, mojom::DocumentPtr document) { ++*counter; },
                  &counter));
-  deferred_runner_->GetFileSize(
+  runner_->GetFileSize(
       GURL(kUrl),
       base::Bind([](int* counter, int64_t size) { ++*counter; }, &counter));
-  deferred_runner_->OpenFileToRead(
+  runner_->OpenFileToRead(
       GURL(kUrl),
       base::Bind([](int* counter, mojo::ScopedHandle handle) { ++*counter; },
                  &counter));