Switch to standard integer types in net/.

net/filter/gzip_header.h

 // Copyright 2014 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.
 
 // The GZipHeader class allows you to parse a gzip header, such as you
 // might find at the beginning of a file compressed by gzip (ie, a .gz
 // file), or at the beginning of an HTTP response that uses a gzip
 // Content-Encoding. See RFC 1952 for the specification for the gzip
 // header.
 //
 // The model is that you call ReadMore() for each chunk of bytes
 // you've read from a file or socket.
 //
 
 #ifndef NET_FILTER_GZIP_HEADER_H_
 #define NET_FILTER_GZIP_HEADER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 
 namespace net {
 
 class GZipHeader {
  public:
   enum Status {
     INCOMPLETE_HEADER,    // don't have all the bits yet...
     COMPLETE_HEADER,      // complete, valid header
     INVALID_HEADER,       // found something invalid in the header
   };
@@ skipping 44 matching lines @@
     IN_FNAME,
 
     IN_FCOMMENT,
 
     IN_FHCRC_BYTE_0,
     IN_FHCRC_BYTE_1,
 
     IN_DONE,
   };
 
-  static const uint8 magic[];  // gzip magic header
+  static const uint8_t magic[];  // gzip magic header
 
   int    state_;  // our current State in the parsing FSM: an int so we can ++
-  uint8  flags_;         // the flags byte of the header ("FLG" in the RFC)
-  uint16 extra_length_;  // how much of the "extra field" we have yet to read
+  uint8_t flags_;  // the flags byte of the header ("FLG" in the RFC)
+  uint16_t extra_length_;  // how much of the "extra field" we have yet to read
 
   DISALLOW_COPY_AND_ASSIGN(GZipHeader);
 };
 
 }  // namespace net
 
 #endif  // NET_FILTER_GZIP_HEADER_H_