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

Unified Diff: sync/test/engine/mock_model_type_processor.h

Issue 1545553003: Switch to standard integer types in sync/. (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 | « sync/test/engine/mock_connection_manager.cc ('k') | sync/test/engine/mock_model_type_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/engine/mock_model_type_processor.h
diff --git a/sync/test/engine/mock_model_type_processor.h b/sync/test/engine/mock_model_type_processor.h
index d926dfe6c26f9d3fba13015ae08df95bffe137a4..120dedc8bc31e90b5d241de01684b9079a84bc8a 100644
--- a/sync/test/engine/mock_model_type_processor.h
+++ b/sync/test/engine/mock_model_type_processor.h
@@ -5,6 +5,9 @@
#ifndef SYNC_TEST_ENGINE_MOCK_MODEL_TYPE_PROCESSOR_H_
#define SYNC_TEST_ENGINE_MOCK_MODEL_TYPE_PROCESSOR_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <map>
#include <string>
#include <vector>
@@ -100,12 +103,12 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
const UpdateResponseDataList& pending_updates);
// Getter and setter for per-item sequence number tracking.
- int64 GetCurrentSequenceNumber(const std::string& tag_hash) const;
- int64 GetNextSequenceNumber(const std::string& tag_hash);
+ int64_t GetCurrentSequenceNumber(const std::string& tag_hash) const;
+ int64_t GetNextSequenceNumber(const std::string& tag_hash);
// Getter and setter for per-item base version tracking.
- int64 GetBaseVersion(const std::string& tag_hash) const;
- void SetBaseVersion(const std::string& tag_hash, int64 version);
+ int64_t GetBaseVersion(const std::string& tag_hash) const;
+ void SetBaseVersion(const std::string& tag_hash, int64_t version);
// Getters and setter for server-assigned ID values.
bool HasServerAssignedId(const std::string& tag_hash) const;
@@ -130,8 +133,8 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
std::map<const std::string, UpdateResponseData> update_response_items_;
// The per-item state maps.
- std::map<const std::string, int64> sequence_numbers_;
- std::map<const std::string, int64> base_versions_;
+ std::map<const std::string, int64_t> sequence_numbers_;
+ std::map<const std::string, int64_t> base_versions_;
std::map<const std::string, std::string> assigned_ids_;
DISALLOW_COPY_AND_ASSIGN(MockModelTypeProcessor);
« no previous file with comments | « sync/test/engine/mock_connection_manager.cc ('k') | sync/test/engine/mock_model_type_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698