Switch to standard integer types in net/.

net/base/openssl_private_key_store.h

 // Copyright (c) 2010 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_BASE_OPENSSL_PRIVATE_KEY_STORE_H_
 #define NET_BASE_OPENSSL_PRIVATE_KEY_STORE_H_
 
 #include <vector>
 
 // Avoid including <openssl/evp.h>
 typedef struct evp_pkey_st EVP_PKEY;
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "net/base/net_export.h"
 
 class GURL;
 
 namespace net {
 
 class X509Certificate;
 
 // OpenSSLPrivateKeyStore provides an interface for storing
 // public/private key pairs to system storage on platforms where
@@ skipping 20 matching lines @@
 
  private:
   OpenSSLPrivateKeyStore();  // not implemented.
   ~OpenSSLPrivateKeyStore();  // not implemented.
   DISALLOW_COPY_AND_ASSIGN(OpenSSLPrivateKeyStore);
 };
 
 } // namespace net
 
 #endif  // NET_BASE_OPENSSL_PRIVATE_KEY_STORE_H_