Switch to standard integer types in components/, part 3 of 4.

BUG=138542
TBR=blundell@chromium.org

Review URL: https://codereview.chromium.org/1551433002

Cr-Commit-Position: refs/heads/master@{#366874}

4 files changed, 22 insertions, 12 deletions

diff --git a/components/network_hints/renderer/dns_prefetch_queue.h b/components/network_hints/renderer/dns_prefetch_queue.h
index 7f5ac2f..2e03f24 100644
--- a/components/network_hints/renderer/dns_prefetch_queue.h
+++ b/components/network_hints/renderer/dns_prefetch_queue.h
@@ -26,7 +26,10 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace network_hints {
@@ -36,7 +39,7 @@ namespace network_hints {
 class DnsQueue {
  public:
   // BufferSize is a signed type used for indexing into a buffer.
-  typedef int32 BufferSize;
+  typedef int32_t BufferSize;
 
   enum PushResult { SUCCESSFUL_PUSH, OVERFLOW_PUSH, REDUNDANT_PUSH };
 
diff --git a/components/network_hints/renderer/dns_prefetch_queue_unittest.cc b/components/network_hints/renderer/dns_prefetch_queue_unittest.cc
index cb808c1..4e8f3ae 100644
--- a/components/network_hints/renderer/dns_prefetch_queue_unittest.cc
+++ b/components/network_hints/renderer/dns_prefetch_queue_unittest.cc
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <sstream>
 
+#include "base/macros.h"
 #include "components/network_hints/renderer/dns_prefetch_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -19,8 +23,9 @@ class DnsQueueTest : public testing::Test {
 // value in sync with the Push value.
 class DnsQueueSequentialTester {
  public:
-  DnsQueueSequentialTester(DnsQueue& buffer, int32 read_counter = 0,
-                           int32 write_counter = 0);
+  DnsQueueSequentialTester(DnsQueue& buffer,
+                           int32_t read_counter = 0,
+                           int32_t write_counter = 0);
 
   // Return of false means buffer was full, or would not take entry.
   bool Push(void);  // Push the string value of next number.
@@ -30,18 +35,17 @@ class DnsQueueSequentialTester {
 
  private:
   DnsQueue* buffer_;
-  int32 read_counter_;  // expected value of next read string.
-  int32 write_counter_;  // Numerical value to write next string.
+  int32_t read_counter_;   // expected value of next read string.
+  int32_t write_counter_;  // Numerical value to write next string.
   DISALLOW_COPY_AND_ASSIGN(DnsQueueSequentialTester);
 };
 
-
-DnsQueueSequentialTester::DnsQueueSequentialTester(
-  DnsQueue& buffer, int32 read_counter, int32 write_counter)
+DnsQueueSequentialTester::DnsQueueSequentialTester(DnsQueue& buffer,
+                                                   int32_t read_counter,
+                                                   int32_t write_counter)
     : buffer_(&buffer),
       read_counter_(read_counter),
-      write_counter_(write_counter) {
-}
+      write_counter_(write_counter) {}
 
 bool DnsQueueSequentialTester::Push(void) {
   std::ostringstream value;
diff --git a/components/network_hints/renderer/renderer_dns_prefetch.h b/components/network_hints/renderer/renderer_dns_prefetch.h
index 9ee4f61..9df9e5b 100644
--- a/components/network_hints/renderer/renderer_dns_prefetch.h
+++ b/components/network_hints/renderer/renderer_dns_prefetch.h
@@ -21,10 +21,12 @@
 #ifndef COMPONENTS_NETWORK_HINTS_RENDERER_RENDERER_DNS_PREFETCH_H_
 #define COMPONENTS_NETWORK_HINTS_RENDERER_RENDERER_DNS_PREFETCH_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/network_hints/renderer/dns_prefetch_queue.h"
 
diff --git a/components/network_hints/renderer/renderer_preconnect.h b/components/network_hints/renderer/renderer_preconnect.h
index 53a8e3d..39dac93 100644
--- a/components/network_hints/renderer/renderer_preconnect.h
+++ b/components/network_hints/renderer/renderer_preconnect.h
@@ -17,6 +17,7 @@
 #ifndef COMPONENTS_NETWORK_HINTS_RENDERER_RENDERER_PRECONNECT_H_
 #define COMPONENTS_NETWORK_HINTS_RENDERER_RENDERER_PRECONNECT_H_
 
+#include "base/macros.h"
 #include "url/gurl.h"
 
 namespace network_hints {