Switch to standard integer types in net/.

net/ssl/openssl_client_key_store.h

 // Copyright (c) 2013 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_SSL_OPENSSL_CLIENT_KEY_STORE_H_
 #define NET_SSL_OPENSSL_CLIENT_KEY_STORE_H_
 
 #include <openssl/evp.h>
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 class X509Certificate;
 
@@ skipping 68 matching lines @@
   std::vector<KeyPair> pairs_;
 
   friend struct base::DefaultSingletonTraits<OpenSSLClientKeyStore>;
 
   DISALLOW_COPY_AND_ASSIGN(OpenSSLClientKeyStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_OPENSSL_CLIENT_KEY_STORE_H_