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

Unified Diff: components/bookmarks/browser/bookmark_codec_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
Index: components/bookmarks/browser/bookmark_codec_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc
index 809446427133b2c8599ce77f9a086d5e73b63e2c..26a2abfa3c12a796fa6fa45544441badf308848c 100644
--- a/components/bookmarks/browser/bookmark_codec_unittest.cc
+++ b/components/bookmarks/browser/bookmark_codec_unittest.cc
@@ -4,6 +4,9 @@
#include "components/bookmarks/browser/bookmark_codec.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h"
@@ -163,7 +166,7 @@ class BookmarkCodecTest : public testing::Test {
bool Decode(BookmarkCodec* codec,
BookmarkModel* model,
const base::Value& value) {
- int64 max_id;
+ int64_t max_id;
bool result = codec->Decode(AsMutable(model->bookmark_bar_node()),
AsMutable(model->other_node()),
AsMutable(model->mobile_node()),
@@ -209,9 +212,9 @@ class BookmarkCodecTest : public testing::Test {
return model.release();
}
- void CheckIDs(const BookmarkNode* node, std::set<int64>* assigned_ids) {
+ void CheckIDs(const BookmarkNode* node, std::set<int64_t>* assigned_ids) {
DCHECK(node);
- int64 node_id = node->id();
+ int64_t node_id = node->id();
EXPECT_TRUE(assigned_ids->find(node_id) == assigned_ids->end());
assigned_ids->insert(node_id);
for (int i = 0; i < node->child_count(); ++i)
@@ -219,7 +222,7 @@ class BookmarkCodecTest : public testing::Test {
}
void ExpectIDsUnique(BookmarkModel* model) {
- std::set<int64> assigned_ids;
+ std::set<int64_t> assigned_ids;
CheckIDs(model->bookmark_bar_node(), &assigned_ids);
CheckIDs(model->other_node(), &assigned_ids);
CheckIDs(model->mobile_node(), &assigned_ids);
« no previous file with comments | « components/bookmarks/browser/bookmark_codec.cc ('k') | components/bookmarks/browser/bookmark_expanded_state_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698