Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: components/drive/job_scheduler_unittest.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/drive/job_scheduler.cc ('k') | components/drive/local_file_reader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/drive/job_scheduler_unittest.cc
diff --git a/components/drive/job_scheduler_unittest.cc b/components/drive/job_scheduler_unittest.cc
index 9ce647925db023d1079f384aa59e4e7a5f2517cf..a6e4f13f745f27f2f0ed7c837203e397f07defce 100644
--- a/components/drive/job_scheduler_unittest.cc
+++ b/components/drive/job_scheduler_unittest.cc
@@ -4,6 +4,9 @@
#include "components/drive/job_scheduler.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <set>
#include "base/bind.h"
@@ -30,7 +33,7 @@ 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,
@@ -65,7 +68,7 @@ class JobListLogger : public JobListObserver {
}
// 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);
@@ -105,7 +108,7 @@ class CancelTestableFakeDriveService : public FakeDriveService {
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,
@@ -266,7 +269,7 @@ TEST_F(JobSchedulerTest, Search) {
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;
@@ -916,7 +919,7 @@ TEST_F(JobSchedulerTest, JobInfoProgress) {
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));
@@ -937,7 +940,7 @@ TEST_F(JobSchedulerTest, JobInfoProgress) {
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));
« no previous file with comments | « components/drive/job_scheduler.cc ('k') | components/drive/local_file_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698