Switch to standard integer types in net/.

net/proxy/proxy_config_service_android.h

 // Copyright (c) 2012 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_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
 #define NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
 
 #include <string>
 
 #include "base/android/jni_android.h"
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
 #include "net/proxy/proxy_config_service.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace net {
 
@@ skipping 68 matching lines @@
   void ProxySettingsChanged();
 
   scoped_refptr<Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid);
 };
 
 } // namespace net
 
 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_