7 files changed, 23 insertions, 25 deletions
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc
index e19e0b6..a38819e 100644
--- a/chrome/browser/net/dns_global.cc
+++ b/chrome/browser/net/dns_global.cc
@@ -299,7 +299,7 @@ class OffTheRecordObserver : public NotificationObserver {
   Lock lock_;
   int count_off_the_record_windows_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(OffTheRecordObserver);
+  DISALLOW_COPY_AND_ASSIGN(OffTheRecordObserver);
 };
 
 // TODO(jar): Use static class object so that I don't have to get the
@@ -391,9 +391,8 @@ void SaveHostNamesForNextStartup(PrefService* local_state) {
   PrefetchObserver::SaveStartupListAsPref(local_state);
 }
 
-// TODO(jar): correct typo in name  change ...Pretch... to ...Prefetch...
-void DnsPretchHostNamesAtStartup(PrefService* user_prefs,
-                                 PrefService* local_state) {
+void DnsPrefetchHostNamesAtStartup(PrefService* user_prefs,
+                                   PrefService* local_state) {
   NameList hostnames;
   // Prefetch DNS for hostnames we learned about during last session.
   // This may catch secondary hostnames, pulled in by the homepages.  It will
diff --git a/chrome/browser/net/dns_global.h b/chrome/browser/net/dns_global.h
index bf27c0c..5fa1e1c 100644
--- a/chrome/browser/net/dns_global.h
+++ b/chrome/browser/net/dns_global.h
@@ -8,8 +8,8 @@
 // provided by DnsMaster to be left as more generally usable code, and possibly
 // be shared across multiple client projects.
 
-#ifndef CHROME_BROWSER_NET_DNS_GLOBAL_H__
-#define CHROME_BROWSER_NET_DNS_GLOBAL_H__
+#ifndef CHROME_BROWSER_NET_DNS_GLOBAL_H_
+#define CHROME_BROWSER_NET_DNS_GLOBAL_H_
 
 #include "chrome/browser/net/dns_master.h"
 
@@ -35,8 +35,8 @@ void DnsPrefetchGetHtmlInfo(std::string* output);
 // Save the hostnames actually used at the start of this session to prefetch
 // during the next startup.
 void SaveHostNamesForNextStartup(PrefService* local_state);
-void DnsPretchHostNamesAtStartup(PrefService* user_prefs,
-                                 PrefService* local_state);
+void DnsPrefetchHostNamesAtStartup(PrefService* user_prefs,
+                                   PrefService* local_state);
 
 // Helper class to handle global init and shutdown.
 class DnsPrefetcherInit {
@@ -47,10 +47,10 @@ class DnsPrefetcherInit {
   ~DnsPrefetcherInit() {ShutdownDnsPrefetch();}
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(DnsPrefetcherInit);
+  DISALLOW_COPY_AND_ASSIGN(DnsPrefetcherInit);
 };
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_GLOBAL_H__
+#endif  // CHROME_BROWSER_NET_DNS_GLOBAL_H_
 
diff --git a/chrome/browser/net/dns_host_info.cc b/chrome/browser/net/dns_host_info.cc
index 296afc9..39dce74 100644
--- a/chrome/browser/net/dns_host_info.cc
+++ b/chrome/browser/net/dns_host_info.cc
@@ -246,7 +246,7 @@ class MinMaxAverage {
   int64 minimum_;
   int64 maximum_;
 
-  // DISALLOW_EVIL_CONSTRUCTORS(MinMaxAverage);
+  // DISALLOW_COPY_AND_ASSIGN(MinMaxAverage);
 };
 
 static std::string HoursMinutesSeconds(int seconds) {
diff --git a/chrome/browser/net/dns_host_info.h b/chrome/browser/net/dns_host_info.h
index d54da84..ee446e1 100644
--- a/chrome/browser/net/dns_host_info.h
+++ b/chrome/browser/net/dns_host_info.h
@@ -8,8 +8,8 @@
 // to a slave, to resolution by the (blocking) DNS service as either FOUND or
 // NO_SUCH_NAME.
 
-#ifndef CHROME_BROWSER_NET_DNS_HOST_INFO_H__
-#define CHROME_BROWSER_NET_DNS_HOST_INFO_H__
+#ifndef CHROME_BROWSER_NET_DNS_HOST_INFO_H_
+#define CHROME_BROWSER_NET_DNS_HOST_INFO_H_
 
 #include <string>
 #include <vector>
@@ -141,10 +141,10 @@ class DnsHostInfo {
 
   // We put these objects into a std::map, and hence we
   // need some "evil" constructors.
-  // DISALLOW_EVIL_CONSTRUCTORS(DnsHostInfo);
+  // DISALLOW_COPY_AND_ASSIGN(DnsHostInfo);
 };
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_HOST_INFO_H__
+#endif  // CHROME_BROWSER_NET_DNS_HOST_INFO_H_
 
diff --git a/chrome/browser/net/dns_master.h b/chrome/browser/net/dns_master.h
index 90f5f2e..d74773585 100644
--- a/chrome/browser/net/dns_master.h
+++ b/chrome/browser/net/dns_master.h
@@ -14,8 +14,8 @@
 // use several DnsSlave threads to concurrently perform the
 // lookups.
 
-#ifndef CHROME_BROWSER_NET_DNS_MASTER_H__
-#define CHROME_BROWSER_NET_DNS_MASTER_H__
+#ifndef CHROME_BROWSER_NET_DNS_MASTER_H_
+#define CHROME_BROWSER_NET_DNS_MASTER_H_
 
 #include <map>
 #include <queue>
@@ -165,10 +165,10 @@ class DnsMaster {
   // and before the HTTP stack tried to look them up.
   Results cache_eviction_map_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DnsMaster);
+  DISALLOW_COPY_AND_ASSIGN(DnsMaster);
 };
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_MASTER_H__
+#endif  // CHROME_BROWSER_NET_DNS_MASTER_H_
 
diff --git a/chrome/browser/net/dns_slave.cc b/chrome/browser/net/dns_slave.cc
index 82406af..2ffb78d 100644
--- a/chrome/browser/net/dns_slave.cc
+++ b/chrome/browser/net/dns_slave.cc
@@ -5,11 +5,10 @@
 // See header file for description of class
 
 #include <ws2tcpip.h>
+#include <Wspiapi.h>  // Needed for win2k compatibility
 
 #include "chrome/browser/net/dns_slave.h"
 
-#include <Wspiapi.h>  // Needed for win2k compatibility
-
 #include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/net/dns_slave.h b/chrome/browser/net/dns_slave.h
index 820ce43..0d77d5e 100644
--- a/chrome/browser/net/dns_slave.h
+++ b/chrome/browser/net/dns_slave.h
@@ -15,8 +15,8 @@
 // This class does no "de-duping," and merely slavishly services
 // items supplied by its DnsMaster.
 
-#ifndef CHROME_BROWSER_NET_DNS_SLAVE_H__
-#define CHROME_BROWSER_NET_DNS_SLAVE_H__
+#ifndef CHROME_BROWSER_NET_DNS_SLAVE_H_
+#define CHROME_BROWSER_NET_DNS_SLAVE_H_
 
 #include <windows.h>
 #include <string>
@@ -63,10 +63,10 @@ class DnsSlave {
 
   void BlockingDnsLookup();
 
-  DISALLOW_EVIL_CONSTRUCTORS(DnsSlave);
+  DISALLOW_COPY_AND_ASSIGN(DnsSlave);
 };
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_SLAVE_H__
+#endif  // CHROME_BROWSER_NET_DNS_SLAVE_H_