Switch to standard integer types in components/, part 1 of 4.

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>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
 
 namespace {
 
 // Dummy value passed for the |expected_file_size| parameter of DownloadFile().
-const int64 kDummyDownloadFileSize = 0;
+const int64_t kDummyDownloadFileSize = 0;
 
 void CopyTitleFromFileResourceCallback(
     std::vector<std::string>* title_list_out,
     google_apis::DriveApiErrorCode error_in,
     scoped_ptr<google_apis::FileResource> entry_in) {
   title_list_out->push_back(entry_in->title());
 }
 
 class JobListLogger : public JobListObserver {
  public:
@@ skipping 14 matching lines @@
   // Checks whether the specified type of event has occurred.
   bool Has(EventType type, JobType job_type) {
     for (size_t i = 0; i < events.size(); ++i) {
       if (events[i].type == type && events[i].info.job_type == job_type)
         return true;
     }
     return false;
   }
 
   // Gets the progress event information of the specified type.
-  void GetProgressInfo(JobType job_type, std::vector<int64>* progress) {
+  void GetProgressInfo(JobType job_type, std::vector<int64_t>* progress) {
     for (size_t i = 0; i < events.size(); ++i) {
       if (events[i].type == UPDATED && events[i].info.job_type == job_type)
         progress->push_back(events[i].info.num_completed_bytes);
     }
   }
 
   // JobListObserver overrides.
   void OnJobAdded(const JobInfo& info) override {
     events.push_back(EventLog(ADDED, info));
   }
@@ skipping 19 matching lines @@
   CancelTestableFakeDriveService()
       : upload_new_file_cancelable_(false) {
   }
 
   void set_upload_new_file_cancelable(bool cancelable) {
     upload_new_file_cancelable_ = cancelable;
   }
 
   google_apis::CancelCallback InitiateUploadNewFile(
       const std::string& content_type,
-      int64 content_length,
+      int64_t content_length,
       const std::string& parent_resource_id,
       const std::string& title,
       const UploadNewFileOptions& options,
       const google_apis::InitiateUploadCallback& callback) override {
     if (upload_new_file_cancelable_)
       return base::Bind(callback, google_apis::DRIVE_CANCELLED, GURL());
 
     return FakeDriveService::InitiateUploadNewFile(content_type,
                                                    content_length,
                                                    parent_resource_id,
@@ skipping 140 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(file_list);
 }
 
 TEST_F(JobSchedulerTest, GetChangeList) {
   ConnectToWifi();
 
-  int64 old_largest_change_id =
+  int64_t old_largest_change_id =
       fake_drive_service_->about_resource().largest_change_id();
 
   google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
 
   // Create a new directory.
   {
     scoped_ptr<google_apis::FileResource> entry;
     fake_drive_service_->AddNewDirectory(
         fake_drive_service_->GetRootResourceId(), "new directory",
         AddNewDirectoryOptions(),
@@ skipping 629 matching lines @@
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       temp_dir.path().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> download_progress;
+  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");
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(path, "Hello"));
   google_apis::DriveApiErrorCode upload_error =
       google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
 
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(), std::string("Hello").size(),
       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> upload_progress;
+  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());
@@ skipping 78 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