Switch to standard integer types in content/browser/.

content/browser/frame_host/navigation_controller_impl_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 103 matching lines @@
 }  // namespace
 
 namespace content {
 
 // TimeSmoother tests ----------------------------------------------------------
 
 // With no duplicates, GetSmoothedTime should be the identity
 // function.
 TEST(TimeSmoother, Basic) {
   NavigationControllerImpl::TimeSmoother smoother;
-  for (int64 i = 1; i < 1000; ++i) {
+  for (int64_t i = 1; i < 1000; ++i) {
     base::Time t = base::Time::FromInternalValue(i);
     EXPECT_EQ(t, smoother.GetSmoothedTime(t));
   }
 }
 
 // With a single duplicate and timestamps thereafter increasing by one
 // microsecond, the smoothed time should always be one behind.
 TEST(TimeSmoother, SingleDuplicate) {
   NavigationControllerImpl::TimeSmoother smoother;
   base::Time t = base::Time::FromInternalValue(1);
   EXPECT_EQ(t, smoother.GetSmoothedTime(t));
-  for (int64 i = 1; i < 1000; ++i) {
+  for (int64_t i = 1; i < 1000; ++i) {
     base::Time expected_t = base::Time::FromInternalValue(i + 1);
     t = base::Time::FromInternalValue(i);
     EXPECT_EQ(expected_t, smoother.GetSmoothedTime(t));
   }
 }
 
 // With k duplicates and timestamps thereafter increasing by one
 // microsecond, the smoothed time should always be k behind.
 TEST(TimeSmoother, ManyDuplicates) {
-  const int64 kNumDuplicates = 100;
+  const int64_t kNumDuplicates = 100;
   NavigationControllerImpl::TimeSmoother smoother;
   base::Time t = base::Time::FromInternalValue(1);
-  for (int64 i = 0; i < kNumDuplicates; ++i) {
+  for (int64_t i = 0; i < kNumDuplicates; ++i) {
     base::Time expected_t = base::Time::FromInternalValue(i + 1);
     EXPECT_EQ(expected_t, smoother.GetSmoothedTime(t));
   }
-  for (int64 i = 1; i < 1000; ++i) {
+  for (int64_t i = 1; i < 1000; ++i) {
     base::Time expected_t =
         base::Time::FromInternalValue(i + kNumDuplicates);
     t = base::Time::FromInternalValue(i);
     EXPECT_EQ(expected_t, smoother.GetSmoothedTime(t));
   }
 }
 
 // If the clock jumps far back enough after a run of duplicates, it
 // should immediately jump to that value.
 TEST(TimeSmoother, ClockBackwardsJump) {
-  const int64 kNumDuplicates = 100;
+  const int64_t kNumDuplicates = 100;
   NavigationControllerImpl::TimeSmoother smoother;
   base::Time t = base::Time::FromInternalValue(1000);
-  for (int64 i = 0; i < kNumDuplicates; ++i) {
+  for (int64_t i = 0; i < kNumDuplicates; ++i) {
     base::Time expected_t = base::Time::FromInternalValue(i + 1000);
     EXPECT_EQ(expected_t, smoother.GetSmoothedTime(t));
   }
   t = base::Time::FromInternalValue(500);
   EXPECT_EQ(t, smoother.GetSmoothedTime(t));
 }
 
 // NavigationControllerTest ----------------------------------------------------
 
 class NavigationControllerTest
@@ skipping 4925 matching lines @@
   EXPECT_EQ(default_ssl_status.connection_status,
             details.ssl_status.connection_status);
   EXPECT_EQ(default_ssl_status.content_status,
             details.ssl_status.content_status);
   EXPECT_EQ(0u, details.ssl_status.signed_certificate_timestamp_ids.size());
 
   EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count());
 }
 
 }  // namespace content