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

Unified Diff: content/browser/frame_host/navigation_controller_impl_browsertest.cc

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index 58d1bd9c4943851d185d80a4da09bf4168df3d0e..c19a4ea951d8644c6fc3d0982468a415b0095c5e 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/command_line.h"
+#include "base/macros.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "content/browser/frame_host/frame_navigation_entry.h"
@@ -2624,8 +2627,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigationEntry* frame_entry =
controller.GetLastCommittedEntry()->GetFrameEntry(root);
- int64 isn_1 = frame_entry->item_sequence_number();
- int64 dsn_1 = frame_entry->document_sequence_number();
+ int64_t isn_1 = frame_entry->item_sequence_number();
+ int64_t dsn_1 = frame_entry->document_sequence_number();
EXPECT_NE(-1, isn_1);
EXPECT_NE(-1, dsn_1);
@@ -2635,8 +2638,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
frame_entry = controller.GetLastCommittedEntry()->GetFrameEntry(root);
- int64 isn_2 = frame_entry->item_sequence_number();
- int64 dsn_2 = frame_entry->document_sequence_number();
+ int64_t isn_2 = frame_entry->item_sequence_number();
+ int64_t dsn_2 = frame_entry->document_sequence_number();
EXPECT_NE(-1, isn_2);
EXPECT_NE(isn_1, isn_2);
EXPECT_EQ(dsn_1, dsn_2);
@@ -2664,8 +2667,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameTreeNode* subframe = root->child_at(0);
FrameNavigationEntry* subframe_entry =
controller.GetLastCommittedEntry()->GetFrameEntry(subframe);
- int64 isn_3 = subframe_entry->item_sequence_number();
- int64 dsn_3 = subframe_entry->document_sequence_number();
+ int64_t isn_3 = subframe_entry->item_sequence_number();
+ int64_t dsn_3 = subframe_entry->document_sequence_number();
EXPECT_NE(-1, isn_2);
EXPECT_NE(isn_2, isn_3);
EXPECT_NE(dsn_2, dsn_3);
@@ -2675,8 +2678,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
subframe_entry = controller.GetLastCommittedEntry()->GetFrameEntry(subframe);
- int64 isn_4 = subframe_entry->item_sequence_number();
- int64 dsn_4 = subframe_entry->document_sequence_number();
+ int64_t isn_4 = subframe_entry->item_sequence_number();
+ int64_t dsn_4 = subframe_entry->document_sequence_number();
EXPECT_NE(-1, isn_4);
EXPECT_NE(isn_3, isn_4);
EXPECT_EQ(dsn_3, dsn_4);

Powered by Google App Engine
This is Rietveld 408576698