Switch to standard integer types in url/.

url/origin.h

 // Copyright 2015 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.
 
 #ifndef URL_ORIGIN_H_
 #define URL_ORIGIN_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "url/scheme_host_port.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_constants.h"
 #include "url/url_export.h"
 
@@ skipping 73 matching lines @@
   // must be valid and canonicalized. In particular, note that this cannot be
   // used to create unique origins; 'url::Origin()' is the right way to do that.
   //
   // This constructor should be used in order to pass 'Origin' objects back and
   // forth over IPC (as transitioning through GURL would risk potentially
   // dangerous recanonicalization); other potential callers should prefer the
   // 'GURL'-based constructor.
   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_; }
 
   // An ASCII serialization of the Origin as per Section 6.2 of RFC 6454, with
   // the addition that all Origins with a 'file' scheme serialize to "file://".
   std::string Serialize() const;
 
   // Two Origins are "same-origin" if their schemes, hosts, and ports are exact
   // matches; and neither is unique.
   bool IsSameOriginWith(const Origin& other) const;
 
   // Allows Origin to be used as a key in STL (for example, a std::set or
   // std::map).
   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_;
 };
 
 URL_EXPORT std::ostream& operator<<(std::ostream& out,
                                     const Origin& origin);
 
 }  // namespace url
 
 #endif  // URL_ORIGIN_H_