| Index: net/socket/client_socket_pool_base.h
|
| diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
|
| index 2f21981969d667bbed61328729b51b83cb2db7ed..c033724fefedb23780d71937f20ee6edea5ed7a2 100644
|
| --- a/net/socket/client_socket_pool_base.h
|
| +++ b/net/socket/client_socket_pool_base.h
|
| @@ -22,6 +22,9 @@
|
| #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_BASE_H_
|
| #define NET_SOCKET_CLIENT_SOCKET_POOL_BASE_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <cstddef>
|
| #include <deque>
|
| #include <list>
|
| @@ -30,7 +33,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -157,7 +160,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
|
| : public ConnectJob::Delegate,
|
| public NetworkChangeNotifier::IPAddressObserver {
|
| public:
|
| - typedef uint32 Flags;
|
| + typedef uint32_t Flags;
|
|
|
| // Used to specify specific behavior for the ClientSocketPool.
|
| enum Flag {
|
|
|