3 files changed, 6 insertions, 11 deletions
diff --git a/net/base/host_resolver.cc b/net/base/host_resolver.cc
index b6d8498..ab706b3 100644
--- a/net/base/host_resolver.cc
+++ b/net/base/host_resolver.cc
@@ -174,4 +174,3 @@ int HostResolver::Resolve(const std::string& hostname, int port,
 }
 
 }  // namespace net
-
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index d49c9fa..5364d17 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -52,10 +52,9 @@ class HostResolver {
   class Request;
   friend class Request;
   scoped_refptr<Request> request_;
-  DISALLOW_EVIL_CONSTRUCTORS(HostResolver);
+  DISALLOW_COPY_AND_ASSIGN(HostResolver);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_H_
-
diff --git a/net/base/host_resolver_unittest.cc b/net/base/host_resolver_unittest.cc
index f081c32a..fde5a1a 100644
--- a/net/base/host_resolver_unittest.cc
+++ b/net/base/host_resolver_unittest.cc
@@ -3,21 +3,18 @@
 // found in the LICENSE file.
 
 #include "net/base/host_resolver.h"
-#include "net/base/address_list.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
-#ifdef OS_WIN
+#if defined(OS_WIN)
 #include <ws2tcpip.h>
 #include <wspiapi.h>
-#endif
-#ifdef OS_POSIX
+#elif defined(OS_POSIX)
 #include <netdb.h>
 #endif
 
-namespace {
+#include "net/base/address_list.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
-class HostResolverTest : public testing::Test {
-};
+namespace {
 
 TEST(HostResolverTest, NumericAddresses) {
   // Stevens says dotted quads with AI_UNSPEC resolve to a single sockaddr_in.