Switch to standard integer types in content/browser/.

content/browser/frame_host/navigation_controller_impl_browsertest.cc

 // Copyright 2014 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 <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"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_controller.h"
@@ skipping 2600 matching lines @@
   // 1. Navigate the main frame.
   GURL url(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_links.html"));
   NavigateToURL(shell(), url);
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
 
   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);
 
   // 2. Do an in-page fragment navigation.
   std::string script = "document.getElementById('fraglink').click()";
   EXPECT_TRUE(content::ExecuteScript(root->current_frame_host(), script));
   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);
 
   // Test subframe sequence numbers only if enabled, e.g. in --site-per-process.
   if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
     return;
 
   // 3. Add a subframe, which does an AUTO_SUBFRAME navigation.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string add_script = "var iframe = document.createElement('iframe');"
                              "iframe.src = '" + url.spec() + "';"
                              "document.body.appendChild(iframe);";
     EXPECT_TRUE(content::ExecuteScript(root->current_frame_host(), add_script));
     capturer.Wait();
     EXPECT_EQ(ui::PAGE_TRANSITION_AUTO_SUBFRAME, capturer.transition_type());
   }
 
   // The root FrameNavigationEntry hasn't changed.
   EXPECT_EQ(frame_entry,
             controller.GetLastCommittedEntry()->GetFrameEntry(root));
 
   // We should have a unique ISN and DSN for the subframe entry.
   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);
 
   // 4. Do an in-page fragment navigation in the subframe.
   EXPECT_TRUE(content::ExecuteScript(subframe->current_frame_host(), script));
   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);
 }
 
 // Support a set of tests that isolate only a subset of sites with
 // out-of-process iframes (OOPIFs).
 class NavigationControllerOopifBrowserTest
     : public NavigationControllerBrowserTest {
  public:
@@ skipping 492 matching lines @@
     EXPECT_EQ(original_url, capturer.all_params()[1].url);
     EXPECT_EQ(original_url, shell()->web_contents()->GetLastCommittedURL());
   }
 
   // Make sure the renderer is still alive.
   EXPECT_TRUE(
       ExecuteScript(shell()->web_contents(), "console.log('Success');"));
 }
 
 }  // namespace content