//chrome/browser and //components A-E: Change ScopedTempDir::path() to GetPath()

components/drive/job_scheduler_unittest.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 "components/drive/job_scheduler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 569 matching lines @@
   ConnectToCellular();
 
   // Disable fetching over cellular network.
   pref_service_->SetBoolean(prefs::kDisableDriveOverCellular, true);
 
   // Try to get a file in the background
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
-      temp_dir.path().AppendASCII("whatever.txt");
+      temp_dir.GetPath().AppendASCII("whatever.txt");
   google_apis::DriveApiErrorCode download_error =
       google_apis::DRIVE_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
       "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
@@ skipping 34 matching lines @@
   ConnectToWimax();
 
   // Disable fetching over cellular network.
   pref_service_->SetBoolean(prefs::kDisableDriveOverCellular, true);
 
   // Try to get a file in the background
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
-      temp_dir.path().AppendASCII("whatever.txt");
+      temp_dir.GetPath().AppendASCII("whatever.txt");
   google_apis::DriveApiErrorCode download_error =
       google_apis::DRIVE_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
       "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
@@ skipping 34 matching lines @@
   ConnectToCellular();
 
   // Enable fetching over cellular network.
   pref_service_->SetBoolean(prefs::kDisableDriveOverCellular, false);
 
   // Try to get a file in the background
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
-      temp_dir.path().AppendASCII("whatever.txt");
+      temp_dir.GetPath().AppendASCII("whatever.txt");
   google_apis::DriveApiErrorCode download_error =
       google_apis::DRIVE_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
       "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
@@ skipping 26 matching lines @@
   ConnectToWimax();
 
   // Enable fetching over cellular network.
   pref_service_->SetBoolean(prefs::kDisableDriveOverCellular, false);
 
   // Try to get a file in the background
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
-      temp_dir.path().AppendASCII("whatever.txt");
+      temp_dir.GetPath().AppendASCII("whatever.txt");
   google_apis::DriveApiErrorCode download_error =
       google_apis::DRIVE_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
       "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
@@ skipping 52 matching lines @@
           &error, &about_resource));
   expected_types.insert(TYPE_UPDATE_RESOURCE);
   scheduler_->UpdateResource(
       "2_file_resource_id", std::string(), "New Title", base::Time(),
       base::Time(), google_apis::drive::Properties(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   expected_types.insert(TYPE_DOWNLOAD_FILE);
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
-      kDummyDownloadFileSize,
-      temp_dir.path().AppendASCII("whatever.txt"),
-      "2_file_resource_id",
-      ClientContext(BACKGROUND),
+      kDummyDownloadFileSize, temp_dir.GetPath().AppendASCII("whatever.txt"),
+      "2_file_resource_id", ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error, &path),
       google_apis::GetContentCallback());
 
   // The number of jobs queued so far.
   EXPECT_EQ(4U, scheduler_->GetJobInfoList().size());
   EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_ADD_NEW_DIRECTORY));
   EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_GET_ABOUT_RESOURCE));
   EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_UPDATE_RESOURCE));
   EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_DOWNLOAD_FILE));
   EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_ADD_NEW_DIRECTORY));
@@ skipping 73 matching lines @@
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   base::FilePath path;
 
   // Download job.
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
-      kDummyDownloadFileSize,
-      temp_dir.path().AppendASCII("whatever.txt"),
-      "2_file_resource_id",
-      ClientContext(BACKGROUND),
+      kDummyDownloadFileSize, temp_dir.GetPath().AppendASCII("whatever.txt"),
+      "2_file_resource_id", ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error, &path),
       google_apis::GetContentCallback());
   base::RunLoop().RunUntilIdle();
 
   std::vector<int64_t> download_progress;
   logger.GetProgressInfo(TYPE_DOWNLOAD_FILE, &download_progress);
   ASSERT_TRUE(!download_progress.empty());
   EXPECT_TRUE(base::STLIsSorted(download_progress));
   EXPECT_GE(download_progress.front(), 0);
   EXPECT_LE(download_progress.back(), 26);
 
   // Upload job.
-  path = temp_dir.path().AppendASCII("new_file.txt");
+  path = temp_dir.GetPath().AppendASCII("new_file.txt");
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(path, kHello));
   google_apis::DriveApiErrorCode upload_error =
       google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<google_apis::FileResource> entry;
 
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(), kHelloLen,
       base::FilePath::FromUTF8Unsafe("drive/new_file.txt"), path, "dummy title",
       "plain/plain", UploadNewFileOptions(), ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&upload_error, &entry));
   base::RunLoop().RunUntilIdle();
 
   std::vector<int64_t> upload_progress;
   logger.GetProgressInfo(TYPE_UPLOAD_NEW_FILE, &upload_progress);
   ASSERT_TRUE(!upload_progress.empty());
   EXPECT_TRUE(base::STLIsSorted(upload_progress));
   EXPECT_GE(upload_progress.front(), 0);
   EXPECT_LE(upload_progress.back(), 13);
 }
 
 TEST_F(JobSchedulerTest, CancelPendingJob) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  base::FilePath upload_path = temp_dir.path().AppendASCII("new_file.txt");
+  base::FilePath upload_path = temp_dir.GetPath().AppendASCII("new_file.txt");
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(upload_path, kHello));
 
   // To create a pending job for testing, set the mode to cellular connection
   // and issue BACKGROUND jobs.
   ConnectToCellular();
   pref_service_->SetBoolean(prefs::kDisableDriveOverCellular, true);
 
   // Start the first job and record its job ID.
   google_apis::DriveApiErrorCode error1 = google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<google_apis::FileResource> entry;
@@ skipping 27 matching lines @@
   EXPECT_EQ(google_apis::DRIVE_CANCELLED, error1);
   EXPECT_EQ(google_apis::HTTP_SUCCESS, error2);
   EXPECT_TRUE(scheduler_->GetJobInfoList().empty());
 }
 
 TEST_F(JobSchedulerTest, CancelRunningJob) {
   ConnectToWifi();
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  base::FilePath upload_path = temp_dir.path().AppendASCII("new_file.txt");
+  base::FilePath upload_path = temp_dir.GetPath().AppendASCII("new_file.txt");
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(upload_path, kHello));
 
   // Run as a cancelable task.
   fake_drive_service_->set_upload_new_file_cancelable(true);
   google_apis::DriveApiErrorCode error1 = google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<google_apis::FileResource> entry;
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(), kHelloLen,
       base::FilePath::FromUTF8Unsafe("dummy/path"), upload_path,
       "dummy title 1", "text/plain", UploadNewFileOptions(),
@@ skipping 19 matching lines @@
   scheduler_->CancelJob(first_job_id);
 
   // Only the first job should be cancelled.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(google_apis::DRIVE_CANCELLED, error1);
   EXPECT_EQ(google_apis::HTTP_SUCCESS, error2);
   EXPECT_TRUE(scheduler_->GetJobInfoList().empty());
 }
 
 }  // namespace drive