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

components/drive/change_list_processor_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/change_list_processor.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_test_util.h"
 #include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_metadata.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 internal {
 
 namespace {
 
-const int64 kBaseResourceListChangestamp = 123;
+const int64_t kBaseResourceListChangestamp = 123;
 const char kRootId[] = "fake_root";
 
 enum FileOrDirectory {
   FILE,
   DIRECTORY,
 };
 
 struct EntryExpectation {
   std::string path;
   std::string id;
@@ skipping 166 matching lines @@
     EXPECT_EQ(kExpected[i].id, entry->resource_id());
 
     ResourceEntry parent_entry;
     EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(
         entry->parent_local_id(), &parent_entry));
     EXPECT_EQ(kExpected[i].parent_id, parent_entry.resource_id());
     EXPECT_EQ(kExpected[i].type,
               entry->file_info().is_directory() ? DIRECTORY : FILE);
   }
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(kBaseResourceListChangestamp, changestamp);
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry new_folder;
   new_folder.set_resource_id("new_folder_resource_id");
@@ skipping 11 matching lines @@
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/New Directory"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/New Directory/File in new dir.txt"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/New Directory/File in new dir.txt")));
   EXPECT_TRUE(changed_files.count(
@@ skipping 14 matching lines @@
 
   change_lists[0]->set_largest_changestamp(16809);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16809, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 2 excludeDir-test/Directory 1"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.CountDirectory(
       base::FilePath::FromUTF8Unsafe("drive/root")));
   EXPECT_TRUE(changed_files.count(
@@ skipping 15 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16815);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16815, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry("drive/root/SubDirectory File 1.txt"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/SubDirectory File 1.txt")));
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
@@ skipping 17 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/SubDirectory File 1.txt")));
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/New SubDirectory File 1.txt")));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16767, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   scoped_ptr<ResourceEntry> new_entry(
       GetResourceEntry("drive/root/Directory 1/New SubDirectory File 1.txt"));
   ASSERT_TRUE(new_entry);
 
   // Keep the to-be-synced properties.
   ASSERT_EQ(1, new_entry->mutable_new_properties()->size());
@@ skipping 13 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16683);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16683, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Added file.txt"));
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
@@ skipping 27 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
@@ skipping 42 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
-  int64 changestamp = 0;
+  int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/New Directory/new_pdf_file.pdf"));
 
   EXPECT_TRUE(changed_files.empty());
 }
 
 TEST_F(ChangeListProcessorTest, RefreshDirectory) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
@@ skipping 13 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII("Directory 1"), &dir1));
   dir1.set_title(dir1.title() + " (renamed)");
   change_list->mutable_entries()->push_back(dir1);
   change_list->mutable_parent_resource_ids()->push_back(kRootId);
 
   // Update the directory with the map.
   ResourceEntry root;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &root));
-  const int64 kNewChangestamp = 12345;
+  const int64_t kNewChangestamp = 12345;
   ResourceEntryVector refreshed_entries;
   EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
       metadata_.get(),
       DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
       change_list.Pass(),
       &refreshed_entries));
 
   // "new_file" should be added.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
@@ skipping 16 matching lines @@
   // This entry should not be added because the parent ID does not match.
   change_list->mutable_parent_resource_ids()->push_back(
       "some-random-resource-id");
   change_list->mutable_entries()->push_back(new_file);
 
 
   // Update the directory.
   ResourceEntry root;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &root));
-  const int64 kNewChangestamp = 12345;
+  const int64_t kNewChangestamp = 12345;
   ResourceEntryVector refreshed_entries;
   EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
       metadata_.get(),
       DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
       change_list.Pass(),
       &refreshed_entries));
 
   // "new_file" should not be added.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, metadata_->GetResourceEntryByPath(
@@ skipping 66 matching lines @@
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
   // The change is rejected due to the old modification date.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
   EXPECT_EQ(new_file_local.title(), entry.title());
 }
 
 }  // namespace internal
 }  // namespace drive