//chrome/browser/chromeos: Change ScopedTempDir::path() to GetPath()

chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

 // Copyright 2015 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/chromeos/file_manager/file_manager_browsertest_base.h"
 
 #include <stddef.h>
 
 #include <deque>
 
@@ skipping 166 matching lines @@
 }
 
 // Test volume.
 class TestVolume {
  protected:
   explicit TestVolume(const std::string& name) : name_(name) {}
   virtual ~TestVolume() {}
 
   bool CreateRootDirectory(const Profile* profile) {
     const base::FilePath path = profile->GetPath().Append(name_);
-    return root_.path() == path || root_.Set(path);
+    // Ensure that |path| is taken by |root_|. Cannot use |root_.GetPath()| to

[vabr (Chromium), 2016/09/07 15:55:06]

I'm aware that this is a bit hacky.

I was tempted to leave out the check involving |current_root_path|, but I was
not sure whether CreateRootDirectory needs to handle the case when |root_|
already owns a different directory.

+    // check if it already is so, because GetPath checks that the current path
+    // is not empty.
+    base::FilePath current_root_path = root_.Take();
+    if (!current_root_path.empty() && current_root_path != path) {
+      CHECK(root_.Set(current_root_path));
+      return false;
+    }
+    return root_.Set(path);
   }
 
   const std::string& name() { return name_; }
-  const base::FilePath root_path() { return root_.path(); }
+  const base::FilePath root_path() { return root_.GetPath(); }
 
  private:
   std::string name_;
   base::ScopedTempDir root_;
 };
 
 // Listener to obtain the test relative messages synchronously.
 class FileManagerTestListener : public content::NotificationObserver {
  public:
   struct Message {
@@ skipping 528 matching lines @@
 }
 
 drive::DriveIntegrationService*
 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) {
   drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume());
   return drive_volumes_[profile->GetOriginalProfile()]
       ->CreateDriveIntegrationService(profile);
 }
 
 }  // namespace file_manager