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}

6 files changed, 16 insertions, 4 deletions

diff --git a/components/query_parser/query_parser.cc b/components/query_parser/query_parser.cc
index bd9d095..7b5e4ee 100644
--- a/components/query_parser/query_parser.cc
+++ b/components/query_parser/query_parser.cc
@@ -10,6 +10,7 @@
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 
diff --git a/components/query_parser/query_parser.h b/components/query_parser/query_parser.h
index d251047..a6e2d22 100644
--- a/components/query_parser/query_parser.h
+++ b/components/query_parser/query_parser.h
@@ -5,9 +5,11 @@
 #ifndef COMPONENTS_QUERY_PARSER_QUERY_PARSER_H_
 #define COMPONENTS_QUERY_PARSER_QUERY_PARSER_H_
 
+#include <stddef.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/query_parser/snippet.h"
 
diff --git a/components/query_parser/query_parser_unittest.cc b/components/query_parser/query_parser_unittest.cc
index 9a63d15..c99c639 100644
--- a/components/query_parser/query_parser_unittest.cc
+++ b/components/query_parser/query_parser_unittest.cc
@@ -2,7 +2,9 @@
 // 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 "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/query_parser/query_parser.h"
diff --git a/components/query_parser/snippet.cc b/components/query_parser/snippet.cc
index 2276e4a..b4840c6 100644
--- a/components/query_parser/snippet.cc
+++ b/components/query_parser/snippet.cc
@@ -4,6 +4,8 @@
 
 #include "components/query_parser/snippet.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
@@ -153,8 +155,8 @@ bool IsNextMatchWithinSnippetWindow(icu::BreakIterator* bi,
   // heuristics to speed things up if necessary, but it's not likely that
   // we need to bother.
   bi->next(kSnippetContext);
-  int64 current = bi->current();
-  return (next_match_start < static_cast<uint64>(current) ||
+  int64_t current = bi->current();
+  return (next_match_start < static_cast<uint64_t>(current) ||
           current == icu::BreakIterator::DONE);
 }
 
diff --git a/components/query_parser/snippet.h b/components/query_parser/snippet.h
index e9096d93..b217901 100644
--- a/components/query_parser/snippet.h
+++ b/components/query_parser/snippet.h
@@ -8,6 +8,8 @@
 #ifndef COMPONENTS_QUERY_PARSER_SNIPPET_H__
 #define COMPONENTS_QUERY_PARSER_SNIPPET_H__
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/components/query_parser/snippet_unittest.cc b/components/query_parser/snippet_unittest.cc
index 727734a..c96fad6 100644
--- a/components/query_parser/snippet_unittest.cc
+++ b/components/query_parser/snippet_unittest.cc
@@ -4,8 +4,11 @@
 
 #include "components/query_parser/snippet.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"