Switch to standard integer types in url/.
BUG=138542
[email protected]
Review URL: https://codereview.chromium.org/1542703002
Cr-Commit-Position: refs/heads/master@{#366454}
diff --git a/url/gurl.cc b/url/gurl.cc
index e2ca9d75..b75bb4f 100644
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -2,23 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <pthread.h>
-#endif
+#include "url/gurl.h"
+
+#include <stddef.h>
#include <algorithm>
#include <ostream>
-#include "url/gurl.h"
-
#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "url/url_canon_stdstring.h"
#include "url/url_util.h"
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+
namespace {
static std::string* empty_string = NULL;
diff --git a/url/gurl.h b/url/gurl.h
index 8c274ea..b49d2fd 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -5,6 +5,8 @@
#ifndef URL_GURL_H_
#define URL_GURL_H_
+#include <stddef.h>
+
#include <iosfwd>
#include <string>
diff --git a/url/gurl_unittest.cc b/url/gurl_unittest.cc
index 18aa2aea..1320609 100644
--- a/url/gurl_unittest.cc
+++ b/url/gurl_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/url/origin.cc b/url/origin.cc
index 9d0c4f08..a0ec2f80 100644
--- a/url/origin.cc
+++ b/url/origin.cc
@@ -4,6 +4,7 @@
#include "url/origin.h"
+#include <stdint.h>
#include <string.h>
#include "base/logging.h"
@@ -38,7 +39,7 @@
unique_ = tuple_.IsInvalid();
}
-Origin::Origin(base::StringPiece scheme, base::StringPiece host, uint16 port)
+Origin::Origin(base::StringPiece scheme, base::StringPiece host, uint16_t port)
: tuple_(scheme, host, port) {
unique_ = tuple_.IsInvalid();
}
@@ -50,7 +51,7 @@
Origin Origin::UnsafelyCreateOriginWithoutNormalization(
base::StringPiece scheme,
base::StringPiece host,
- uint16 port) {
+ uint16_t port) {
return Origin(scheme, host, port);
}
diff --git a/url/origin.h b/url/origin.h
index dc2f85f..3b9f50bd 100644
--- a/url/origin.h
+++ b/url/origin.h
@@ -5,6 +5,8 @@
#ifndef URL_ORIGIN_H_
#define URL_ORIGIN_H_
+#include <stdint.h>
+
#include <string>
#include "base/strings/string16.h"
@@ -98,14 +100,14 @@
static Origin UnsafelyCreateOriginWithoutNormalization(
base::StringPiece scheme,
base::StringPiece host,
- uint16 port);
+ uint16_t port);
~Origin();
// For unique origins, these return ("", "", 0).
const std::string& scheme() const { return tuple_.scheme(); }
const std::string& host() const { return tuple_.host(); }
- uint16 port() const { return tuple_.port(); }
+ uint16_t port() const { return tuple_.port(); }
bool unique() const { return unique_; }
@@ -122,7 +124,7 @@
bool operator<(const Origin& other) const;
private:
- Origin(base::StringPiece scheme, base::StringPiece host, uint16 port);
+ Origin(base::StringPiece scheme, base::StringPiece host, uint16_t port);
SchemeHostPort tuple_;
bool unique_;
diff --git a/url/origin_unittest.cc b/url/origin_unittest.cc
index ec4ec65..6a3128b7 100644
--- a/url/origin_unittest.cc
+++ b/url/origin_unittest.cc
@@ -2,10 +2,14 @@
// 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 "base/logging.h"
-#include "url/origin.h"
+#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
+#include "url/origin.h"
namespace {
@@ -44,7 +48,7 @@
const char* const url;
const char* const expected_scheme;
const char* const expected_host;
- const uint16 expected_port;
+ const uint16_t expected_port;
} cases[] = {
// IP Addresses
{"http://192.168.9.1/", "http", "192.168.9.1", 80},
@@ -162,7 +166,7 @@
struct TestCase {
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} cases[] = {
{"http", "example.com", 80},
{"http", "example.com", 123},
@@ -189,7 +193,7 @@
struct TestCases {
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} cases[] = {{"", "", 0},
{"data", "", 0},
{"blob", "", 0},
@@ -226,7 +230,7 @@
size_t scheme_length;
const char* host;
size_t host_length;
- uint16 port;
+ uint16_t port;
} cases[] = {{"http\0more", 9, "example.com", 11, 80},
{"http\0", 5, "example.com", 11, 80},
{"\0http", 5, "example.com", 11, 80},
diff --git a/url/scheme_host_port.cc b/url/scheme_host_port.cc
index 6e84b184..4d0f000 100644
--- a/url/scheme_host_port.cc
+++ b/url/scheme_host_port.cc
@@ -4,6 +4,7 @@
#include "url/scheme_host_port.h"
+#include <stdint.h>
#include <string.h>
#include <tuple>
@@ -47,7 +48,7 @@
bool IsValidInput(const base::StringPiece& scheme,
const base::StringPiece& host,
- uint16 port) {
+ uint16_t port) {
SchemeType scheme_type = SCHEME_WITH_PORT;
bool is_standard = GetStandardSchemeType(
scheme.data(),
@@ -103,7 +104,7 @@
SchemeHostPort::SchemeHostPort(base::StringPiece scheme,
base::StringPiece host,
- uint16 port)
+ uint16_t port)
: port_(0) {
if (!IsValidInput(scheme, host, port))
return;
diff --git a/url/scheme_host_port.h b/url/scheme_host_port.h
index 3aca558..47a9041 100644
--- a/url/scheme_host_port.h
+++ b/url/scheme_host_port.h
@@ -5,9 +5,10 @@
#ifndef URL_SCHEME_HOST_PORT_H_
#define URL_SCHEME_HOST_PORT_H_
+#include <stdint.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/strings/string_piece.h"
#include "url/url_export.h"
@@ -81,7 +82,9 @@
// support ports (e.g. 'file'). In that case, |port| must be 0.
//
// Copies the data in |scheme| and |host|.
- SchemeHostPort(base::StringPiece scheme, base::StringPiece host, uint16 port);
+ SchemeHostPort(base::StringPiece scheme,
+ base::StringPiece host,
+ uint16_t port);
// Creates a (scheme, host, port) tuple from |url|, as described at
// https://tools.ietf.org/html/rfc6454#section-4
@@ -97,7 +100,7 @@
// and all IPv6 addresses will be enclosed in brackets ("[2001:db8::1]").
const std::string& host() const { return host_; }
const std::string& scheme() const { return scheme_; }
- uint16 port() const { return port_; }
+ uint16_t port() const { return port_; }
bool IsInvalid() const;
// Serializes the SchemeHostPort tuple to a canonical form.
@@ -123,7 +126,7 @@
private:
std::string scheme_;
std::string host_;
- uint16 port_;
+ uint16_t port_;
};
} // namespace url
diff --git a/url/scheme_host_port_unittest.cc b/url/scheme_host_port_unittest.cc
index 817631d7..7e9351f 100644
--- a/url/scheme_host_port_unittest.cc
+++ b/url/scheme_host_port_unittest.cc
@@ -2,6 +2,10 @@
// 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 "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
#include "url/scheme_host_port.h"
@@ -40,7 +44,7 @@
struct TestCases {
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} cases[] = {
{"http", "example.com", 80},
{"http", "example.com", 123},
@@ -66,7 +70,7 @@
struct TestCases {
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} cases[] = {{"", "", 0},
{"data", "", 0},
{"blob", "", 0},
@@ -103,7 +107,7 @@
size_t scheme_length;
const char* host;
size_t host_length;
- uint16 port;
+ uint16_t port;
} cases[] = {{"http\0more", 9, "example.com", 11, 80},
{"http\0", 5, "example.com", 11, 80},
{"\0http", 5, "example.com", 11, 80},
@@ -129,7 +133,7 @@
const char* url;
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} cases[] = {
{"http://192.168.9.1/", "http", "192.168.9.1", 80},
{"http://[2001:db8::1]/", "http", "[2001:db8::1]", 80},
@@ -188,7 +192,7 @@
struct SchemeHostPorts {
const char* scheme;
const char* host;
- uint16 port;
+ uint16_t port;
} tuples[] = {
{"http", "a", 80},
{"http", "b", 80},
diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc
index 8a80d710..d0468cc 100644
--- a/url/url_canon_icu.cc
+++ b/url/url_canon_icu.cc
@@ -4,6 +4,7 @@
// ICU integration functions.
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
diff --git a/url/url_canon_icu_unittest.cc b/url/url_canon_icu_unittest.cc
index 12b7ded9..13601f0 100644
--- a/url/url_canon_icu_unittest.cc
+++ b/url/url_canon_icu_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/icu/source/common/unicode/ucnv.h"
diff --git a/url/url_canon_internal.cc b/url/url_canon_internal.cc
index 164c6cf0..a727ca2 100644
--- a/url/url_canon_internal.cc
+++ b/url/url_canon_internal.cc
@@ -5,6 +5,7 @@
#include "url/url_canon_internal.h"
#include <errno.h>
+#include <stddef.h>
#include <stdlib.h>
#include <cstdio>
diff --git a/url/url_canon_internal.h b/url/url_canon_internal.h
index 8a926b6..e651e0c 100644
--- a/url/url_canon_internal.h
+++ b/url/url_canon_internal.h
@@ -10,6 +10,7 @@
// template bloat because everything is inlined when anybody calls any of our
// functions.
+#include <stddef.h>
#include <stdlib.h>
#include "base/logging.h"
diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc
index d82f6a8..82edd0e 100644
--- a/url/url_canon_unittest.cc
+++ b/url/url_canon_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <errno.h>
+#include <stddef.h>
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/url/url_parse_unittest.cc b/url/url_parse_unittest.cc
index 6bf536e..b80e865 100644
--- a/url/url_parse_unittest.cc
+++ b/url/url_parse_unittest.cc
@@ -4,6 +4,8 @@
#include "url/third_party/mozilla/url_parse.h"
+#include <stddef.h>
+
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/third_party/mozilla/url_parse.h"
diff --git a/url/url_util.cc b/url/url_util.cc
index 21bf3cc..cbb252f 100644
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -4,6 +4,7 @@
#include "url/url_util.h"
+#include <stddef.h>
#include <string.h>
#include <vector>
diff --git a/url/url_util_unittest.cc b/url/url_util_unittest.cc
index b89bfa16..41430621 100644
--- a/url/url_util_unittest.cc
+++ b/url/url_util_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/third_party/mozilla/url_parse.h"
