7 files changed, 53 insertions, 34 deletions
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h
index 373d09d..8e83f0c 100644
--- a/net/base/ev_root_ca_metadata.h
+++ b/net/base/ev_root_ca_metadata.h
@@ -27,11 +27,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef NET_BASE_EV_ROOT_CA_METADATA_H__
-#define NET_BASE_EV_ROOT_CA_METADATA_H__
+#ifndef NET_BASE_EV_ROOT_CA_METADATA_H_
+#define NET_BASE_EV_ROOT_CA_METADATA_H_
 
 #include <map>
 
+#include "base/scoped_ptr.h"
 #include "net/base/x509_certificate.h"
 
 template <typename T>
@@ -71,9 +72,9 @@ class EVRootCAMetadata {
   scoped_array<const char*> policy_oids_;
   int num_policy_oids_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(EVRootCAMetadata);
+  DISALLOW_COPY_AND_ASSIGN(EVRootCAMetadata);
 };
 
 }  // namespace net
 
-#endif  // NET_BASE_EV_ROOT_CA_METADATA_H__
+#endif  // NET_BASE_EV_ROOT_CA_METADATA_H_
diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc
index ec15435..fb0a6fe 100644
--- a/net/base/upload_data.cc
+++ b/net/base/upload_data.cc
@@ -27,9 +27,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include "net/base/upload_data.h"
+
 #include <windows.h>
 
-#include "net/base/upload_data.h"
+#include "base/logging.h"
 
 namespace net {
 
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index 18ed05e..154a994 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -29,6 +29,8 @@
 
 #include "net/base/upload_data_stream.h"
 
+#include "base/logging.h"
+
 namespace net {
 
 UploadDataStream::UploadDataStream(const UploadData* data)
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h
index f692b01..93b9a0b 100644
--- a/net/disk_cache/file.h
+++ b/net/disk_cache/file.h
@@ -29,8 +29,10 @@
 
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
-#ifndef NET_DISK_CACHE_FILE_H__
-#define NET_DISK_CACHE_FILE_H__
+#ifndef NET_DISK_CACHE_FILE_H_
+#define NET_DISK_CACHE_FILE_H_
+
+#include <string>
 
 #include "base/ref_counted.h"
 #include "net/disk_cache/os_file.h"
@@ -107,4 +109,4 @@ class File : public base::RefCounted<File> {
 
 }  // namespace disk_cache
 
-#endif  // NET_DISK_CACHE_FILE_H__
+#endif  // NET_DISK_CACHE_FILE_H_
diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h
index 693ea90..ece272a 100644
--- a/net/disk_cache/mapped_file.h
+++ b/net/disk_cache/mapped_file.h
@@ -29,8 +29,10 @@
 
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
-#ifndef NET_DISK_CACHE_MAPPED_FILE_H__
-#define NET_DISK_CACHE_MAPPED_FILE_H__
+#ifndef NET_DISK_CACHE_MAPPED_FILE_H_
+#define NET_DISK_CACHE_MAPPED_FILE_H_
+
+#include <string>
 
 #include "base/ref_counted.h"
 #include "net/disk_cache/disk_format.h"
@@ -71,9 +73,9 @@ class MappedFile : public File {
   void* buffer_;  // Address of the memory mapped buffer.
   size_t view_size_;  // Size of the memory pointed by buffer_.
 
-  DISALLOW_EVIL_CONSTRUCTORS(MappedFile);
+  DISALLOW_COPY_AND_ASSIGN(MappedFile);
 };
 
 }  // namespace disk_cache
 
-#endif  // NET_DISK_CACHE_MAPPED_FILE_H__
+#endif  // NET_DISK_CACHE_MAPPED_FILE_H_
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 628038f..21c91c8 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -80,6 +80,33 @@ void URLRequestJob::SetupFilter() {
   }
 }
 
+void URLRequestJob::GetAuthChallengeInfo(
+    scoped_refptr<net::AuthChallengeInfo>* auth_info) {
+  // This will only be called if NeedsAuth() returns true, in which
+  // case the derived class should implement this!
+  NOTREACHED();
+}
+
+void URLRequestJob::SetAuth(const std::wstring& username,
+                            const std::wstring& password) {
+  // This will only be called if NeedsAuth() returns true, in which
+  // case the derived class should implement this!
+  NOTREACHED();
+}
+
+void URLRequestJob::CancelAuth() {
+  // This will only be called if NeedsAuth() returns true, in which
+  // case the derived class should implement this!
+  NOTREACHED();
+}
+
+void URLRequestJob::ContinueDespiteLastError() {
+  // Implementations should know how to recover from errors they generate.
+  // If this code was reached, we are trying to recover from an error that
+  // we don't know how to recover from.
+  NOTREACHED();
+}
+
 // This function calls ReadData to get stream data. If a filter exists, passes
 // the data to the attached filter. Then returns the output from filter back to
 // the caller.
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 7ceaa55..ed5cfba 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -171,11 +171,7 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
 
   // Fills the authentication info with the server's response.
   virtual void GetAuthChallengeInfo(
-      scoped_refptr<net::AuthChallengeInfo>* auth_info) {
-    // This will only be called if NeedsAuth() returns true, in which
-    // case the derived class should implement this!
-    NOTREACHED();
-  }
+      scoped_refptr<net::AuthChallengeInfo>* auth_info);
 
   // Returns cached auth data for the auth challenge.  Returns NULL if there
   // is no auth cache or if the auth cache doesn't have the auth data for
@@ -187,26 +183,13 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
 
   // Resend the request with authentication credentials.
   virtual void SetAuth(const std::wstring& username,
-                       const std::wstring& password) {
-    // This will only be called if NeedsAuth() returns true, in which
-    // case the derived class should implement this!
-    NOTREACHED();
-  }
+                       const std::wstring& password);
 
   // Display the error page without asking for credentials again.
-  virtual void CancelAuth() {
-    // This will only be called if NeedsAuth() returns true, in which
-    // case the derived class should implement this!
-    NOTREACHED();
-  }
+  virtual void CancelAuth();
 
   // Continue processing the request ignoring the last error.
-  virtual void ContinueDespiteLastError() {
-    // Implementations should know how to recover from errors they generate.
-    // If this code was reached, we are trying to recover from an error that
-    // we don't know how to recover from.
-    NOTREACHED();
-  }
+  virtual void ContinueDespiteLastError();
 
   // Returns true if the Job is done producing response data and has called
   // NotifyDone on the request.
@@ -333,7 +316,7 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
   // Expected content size
   int64 expected_content_size_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequestJob);
+  DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_