Switch to standard integer types in net/.

net/server/web_socket_encoder.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.
 
 #ifndef NET_SERVER_WEB_SOCKET_ENCODER_H_
 #define NET_SERVER_WEB_SOCKET_ENCODER_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/server/web_socket.h"
 #include "net/websockets/websocket_deflater.h"
 #include "net/websockets/websocket_inflater.h"
 
 namespace net {
 
 class WebSocketDeflateParameters;
 
@@ skipping 39 matching lines @@
   Type type_;
   scoped_ptr<WebSocketDeflater> deflater_;
   scoped_ptr<WebSocketInflater> inflater_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketEncoder);
 };
 
 }  // namespace net
 
 #endif  // NET_SERVER_WEB_SOCKET_ENCODER_H_