Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/net/proxy_service_factory.h

 // Copyright (c) 2011 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 CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 class PrefProxyConfigTracker;
 class PrefService;
 
 namespace base {
 class CommandLine;
 }
 
 namespace net {
@@ skipping 32 matching lines @@
       net::NetworkDelegate* network_delegate,
       scoped_ptr<net::ProxyConfigService> proxy_config_service,
       const base::CommandLine& command_line,
       bool quick_check_enabled);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);
 };
 
 #endif  // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_