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

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 @@
       "entries", &AddEntriesMessage::entries);
 }
 
 // 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);
+    if (root_initialized_)
+      return true;
+
+    root_initialized_ = root_.Set(profile->GetPath().Append(name_));
+    return root_initialized_;
   }
 
-  const std::string& name() { return name_; }
-  const base::FilePath root_path() { return root_.path(); }
+  const std::string& name() const { return name_; }
+  const base::FilePath& root_path() const { return root_.GetPath(); }
 
  private:
   std::string name_;
   base::ScopedTempDir root_;
+  bool root_initialized_ = false;
 };
 
 // Listener to obtain the test relative messages synchronously.
 class FileManagerTestListener : public content::NotificationObserver {
  public:
   struct Message {
     int type;
     std::string message;
     scoped_refptr<extensions::TestSendMessageFunction> function;
   };
@@ skipping 524 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