Fix temp dir leaks in remoting_unittests.

ScopedPathOverride instances must be cleaned up after TaskEnvironment so
that residual tasks have a chance to close all open file handles.

BUG=546640
R=joedow@chromium.org

Change-Id: I4c3b26e1176ec851625e2d8041ed91c9ce56b9ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1889976
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Auto-Submit: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711429}

remoting/host/file_transfer/ipc_file_operations_unittest.cc

@@ -114,19 +114,19 @@ class IpcFileOperationsTest : public testing::Test {
 
   base::FilePath TestDir();
 
-  base::test::TaskEnvironment task_environment_;
+  // Points DIR_USER_DESKTOP at a scoped temporary directory.
   base::ScopedPathOverride scoped_path_override_;
+  base::test::TaskEnvironment task_environment_;
   std::unique_ptr<FileOperations> file_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(IpcFileOperationsTest);
 };
 
 IpcFileOperationsTest::IpcFileOperationsTest()
-    : task_environment_(
+    : scoped_path_override_(base::DIR_USER_DESKTOP),
+      task_environment_(
           base::test::TaskEnvironment::MainThreadType::DEFAULT,
           base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
-      // Points DIR_USER_DESKTOP at a scoped temporary directory.
-      scoped_path_override_(base::DIR_USER_DESKTOP),
       file_operations_(std::make_unique<IpcTestBridge>(
           task_environment_.GetMainThreadTaskRunner())) {}
 

remoting/host/file_transfer/local_file_operations_unittest.cc

@@ -60,19 +60,19 @@ class LocalFileOperationsTest : public testing::Test {
                            FileOperations::Writer::Result result);
   void OnCloseComplete(FileOperations::Writer::Result result);
 
-  base::test::TaskEnvironment task_environment_;
+  // Points DIR_USER_DESKTOP at a scoped temporary directory.
   base::ScopedPathOverride scoped_path_override_;
+  base::test::TaskEnvironment task_environment_;
   std::unique_ptr<FileOperations> file_operations_;
   std::unique_ptr<FileOperations::Writer> file_writer_;
   bool operation_completed_ = false;
 };
 
 LocalFileOperationsTest::LocalFileOperationsTest()
-    : task_environment_(
+    : scoped_path_override_(base::DIR_USER_DESKTOP),
+      task_environment_(
           base::test::TaskEnvironment::MainThreadType::DEFAULT,
           base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
-      // Points DIR_USER_DESKTOP at a scoped temporary directory.
-      scoped_path_override_(base::DIR_USER_DESKTOP),
       file_operations_(std::make_unique<LocalFileOperations>(
           task_environment_.GetMainThreadTaskRunner())) {}