FileAPI: Clean up around FileSystemBackend

webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc

Index: webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
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 1b7c872ee2c238fc4388931731d2b9fa5dc9b610..95e73c6c0d041991e93811dd0576e0116e879dd4 100644
--- a/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/webkit/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -127,26 +127,23 @@ class CopyOrMoveOperationTestHelper {
         CreateFileSystemContextForTesting(quota_manager_proxy_.get(), base_dir);
 
     // Prepare the origin's root directory.
-    FileSystemBackend* mount_point_provider =
+    FileSystemBackend* backend =
         file_system_context_->GetFileSystemBackend(src_type_);
-    mount_point_provider->OpenFileSystem(
-        origin_, src_type_,
-        OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
-        base::Bind(&ExpectOk));
-    mount_point_provider =
-        file_system_context_->GetFileSystemBackend(dest_type_);
+    backend->OpenFileSystem(origin_, src_type_,
+                            OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+                            base::Bind(&ExpectOk));
+    backend = file_system_context_->GetFileSystemBackend(dest_type_);
     if (dest_type_ == kFileSystemTypeTest) {
-      TestFileSystemBackend* test_provider =
-          static_cast<TestFileSystemBackend*>(mount_point_provider);
+      TestFileSystemBackend* test_backend =
+          static_cast<TestFileSystemBackend*>(backend);
       scoped_ptr<CopyOrMoveFileValidatorFactory> factory(
           new TestValidatorFactory);
-      test_provider->set_require_copy_or_move_validator(true);
-      test_provider->InitializeCopyOrMoveFileValidatorFactory(factory.Pass());
+      test_backend->set_require_copy_or_move_validator(true);
+      test_backend->InitializeCopyOrMoveFileValidatorFactory(factory.Pass());
     }
-    mount_point_provider->OpenFileSystem(
-        origin_, dest_type_,
-        OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
-        base::Bind(&ExpectOk));
+    backend->OpenFileSystem(origin_, dest_type_,
+                            OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+                            base::Bind(&ExpectOk));
     base::MessageLoop::current()->RunUntilIdle();
 
     // Grant relatively big quota initially.