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

chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 105 matching lines @@
 
 // Sets up the initial file system state for native local and restricted native
 // local file systems. The hierarchy is the same as for the drive file system.
 // The directory is created at unique_temp_dir/|mount_point_name| path.
 bool InitializeLocalFileSystem(std::string mount_point_name,
                                base::ScopedTempDir* tmp_dir,
                                base::FilePath* mount_point_dir) {
   if (!tmp_dir->CreateUniqueTempDir())
     return false;
 
-  *mount_point_dir = tmp_dir->path().AppendASCII(mount_point_name);
+  *mount_point_dir = tmp_dir->GetPath().AppendASCII(mount_point_name);
   // Create the mount point.
   if (!base::CreateDirectory(*mount_point_dir))
     return false;
 
   base::FilePath test_dir = mount_point_dir->AppendASCII("test_dir");
   if (!base::CreateDirectory(test_dir))
     return false;
 
   base::FilePath test_subdir = test_dir.AppendASCII("empty_test_dir");
   if (!base::CreateDirectory(test_subdir))
@@ skipping 401 matching lines @@
 
     // DriveFileSystemExtensionApiTest doesn't expect that several user profiles
     // could exist simultaneously.
     DCHECK(fake_drive_service_ == NULL);
     fake_drive_service_ = new drive::FakeDriveService;
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
     std::map<std::string, std::string> resource_ids;
     EXPECT_TRUE(InitializeDriveService(fake_drive_service_, &resource_ids));
 
-    return new drive::DriveIntegrationService(
-        profile, NULL, fake_drive_service_, "", test_cache_root_.path(), NULL);
+    return new drive::DriveIntegrationService(profile, NULL,
+                                              fake_drive_service_, "",
+                                              test_cache_root_.GetPath(), NULL);
   }
 
   base::ScopedTempDir test_cache_root_;
   drive::FakeDriveService* fake_drive_service_;
   DriveIntegrationServiceFactory::FactoryCallback
       create_drive_integration_service_;
   std::unique_ptr<DriveIntegrationServiceFactory::ScopedFactoryForTest>
       service_factory_for_test_;
 };
 
 // Tests for Drive file systems in multi-profile setting.
 class MultiProfileDriveFileSystemExtensionApiTest :
     public FileSystemExtensionApiTestBase {
  public:
   MultiProfileDriveFileSystemExtensionApiTest() : second_profile_(NULL) {}
 
   void SetUpOnMainThread() override {
-    ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
-
     base::FilePath user_data_directory;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
     user_manager::UserManager::Get()->UserLoggedIn(
         AccountId::FromUserEmail(kSecondProfileAccount), kSecondProfileHash,
         false);
     // Set up the secondary profile.
     base::FilePath profile_dir =
         user_data_directory.Append(
             chromeos::ProfileHelper::GetUserProfileDir(
                 kSecondProfileHash).BaseName());
     second_profile_ =
         g_browser_process->profile_manager()->GetProfile(profile_dir);
 
     FileSystemExtensionApiTestBase::SetUpOnMainThread();
   }
 
   void InitTestFileSystem() override {
+    ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());

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

I needed to move the CreateUniqueTempDir call from SetUpOnMainThread to here,
because the latter gets executed after the path of the directory is needed the
first time.

This was a real issue in the test before, because on line 606 of the original
patch, it would create a subdirectory in "" instead of the scoped temp dir.

Having the CreateUniqueTempDir matches what DriveFileSystemExtensionApiTest
above does.

+
     // This callback will get called during Profile creation.
     create_drive_integration_service_ = base::Bind(
         &MultiProfileDriveFileSystemExtensionApiTest::
             CreateDriveIntegrationService,
         base::Unretained(this));
     service_factory_for_test_.reset(
         new DriveIntegrationServiceFactory::ScopedFactoryForTest(
             &create_drive_integration_service_));
   }
 
   void AddTestMountPoint() override {
     test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
     test_util::WaitUntilDriveMountPointIsAdded(second_profile_);
   }
 
  protected:
   // DriveIntegrationService factory function for this test.
   drive::DriveIntegrationService* CreateDriveIntegrationService(
       Profile* profile) {
     base::FilePath cache_dir;
-    base::CreateTemporaryDirInDir(tmp_dir_.path(), base::FilePath::StringType(),
-                                  &cache_dir);
+    base::CreateTemporaryDirInDir(tmp_dir_.GetPath(),
+                                  base::FilePath::StringType(), &cache_dir);
 
     drive::FakeDriveService* const fake_drive_service =
         new drive::FakeDriveService;
     fake_drive_service->LoadAppListForDriveApi("drive/applist.json");
     EXPECT_TRUE(InitializeDriveService(fake_drive_service, &resource_ids_));
 
     return new drive::DriveIntegrationService(
         profile, NULL, fake_drive_service, std::string(), cache_dir, NULL);
   }
 
@@ skipping 82 matching lines @@
  protected:
   // DriveIntegrationService factory function for this test.
   drive::DriveIntegrationService* CreateDriveIntegrationService(
       Profile* profile) {
     fake_drive_service_ = new drive::FakeDriveService;
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
     std::map<std::string, std::string> resource_ids;
     EXPECT_TRUE(InitializeDriveService(fake_drive_service_, &resource_ids));
 
-    return new drive::DriveIntegrationService(profile,
-                                              NULL,
-                                              fake_drive_service_,
-                                              "drive",
-                                              test_cache_root_.path(),
-                                              NULL);
+    return new drive::DriveIntegrationService(profile, NULL,
+                                              fake_drive_service_, "drive",
+                                              test_cache_root_.GetPath(), NULL);
   }
 
  private:
   // For local volume.
   base::ScopedTempDir local_tmp_dir_;
   base::FilePath local_mount_point_dir_;
 
   // For drive volume.
   base::ScopedTempDir test_cache_root_;
   drive::FakeDriveService* fake_drive_service_;
@@ skipping 132 matching lines @@
                        AppFileHandlerMulti) {
   EXPECT_TRUE(
       RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi",
                                     FILE_PATH_LITERAL("manifest.json"),
                                     "",
                                     FLAGS_NONE))
       << message_;
 }
 }  // namespace
 }  // namespace file_manager