Switch to standard integer types in net/.

net/tools/net_watcher/net_watcher.cc

 // 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.
 
 // This is a small utility that watches for and logs network changes.
 
 #include <string>
 
 #include "base/at_exit.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 
@@ skipping 193 matching lines @@
   proxy_config_service->RemoveObserver(&net_watcher);
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::RemoveDNSObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(&net_watcher);
 
   return 0;
 }