Fix incorrect include guards in net/, where the guard didn't match the filename.

Also add a guard to data_url.h which was missing a guard.

Review URL: http://codereview.chromium.org/42282


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11865 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 22 insertions, 17 deletions

diff --git a/net/base/data_url.h b/net/base/data_url.h
index 2418f35..aa63d5c 100644
--- a/net/base/data_url.h
+++ b/net/base/data_url.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef NET_BASE_DATA_URL_H_
+#define NET_BASE_DATA_URL_H_
+
 #include <string>
 
 class GURL;
@@ -40,3 +43,5 @@ class DataURL {
 };
 
 }  // namespace net
+
+#endif  // NET_BASE_DATA_URL_H_
diff --git a/net/base/gzip_header.h b/net/base/gzip_header.h
index 64de9ce..725537b 100644
--- a/net/base/gzip_header.h
+++ b/net/base/gzip_header.h
@@ -12,8 +12,8 @@
 // you've read from a file or socket.
 //
 
-#ifndef NET_BASE_GZIPHEADER_H__
-#define NET_BASE_GZIPHEADER_H__
+#ifndef NET_BASE_GZIP_HEADER_H_
+#define NET_BASE_GZIP_HEADER_H_
 
 #include "base/basictypes.h"
 
@@ -92,4 +92,4 @@ class GZipHeader {
   uint16 extra_length_;  // how much of the "extra field" we have yet to read
 };
 
-#endif  // NET_BASE_GZIPHEADER_H__
+#endif  // NET_BASE_GZIP_HEADER_H_
diff --git a/net/base/telnet_server.h b/net/base/telnet_server.h
index 9b9c4e8..e1c9344 100644
--- a/net/base/telnet_server.h
+++ b/net/base/telnet_server.h
@@ -58,4 +58,4 @@ private:
   DISALLOW_EVIL_CONSTRUCTORS(TelnetServer);
 };
 
-#endif // BASE_TELNET_SERVER_H_
+#endif // NET_BASE_TELNET_SERVER_H_
diff --git a/net/disk_cache/storage_block-inl.h b/net/disk_cache/storage_block-inl.h
index 485a1b1..9ec9fa0 100644
--- a/net/disk_cache/storage_block-inl.h
+++ b/net/disk_cache/storage_block-inl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
-#define NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
+#ifndef NET_DISK_CACHE_STORAGE_BLOCK_INL_H_
+#define NET_DISK_CACHE_STORAGE_BLOCK_INL_H_
 
 #include "net/disk_cache/storage_block.h"
 
@@ -133,4 +133,4 @@ template<typename T> void StorageBlock<T>::DeleteData() {
 
 }  // namespace disk_cache
 
-#endif  // NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
+#endif  // NET_DISK_CACHE_STORAGE_BLOCK_INL_H_
diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h
index 1d15911..e9b2c4b 100644
--- a/net/http/http_response_headers.h
+++ b/net/http/http_response_headers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_HTTP_RESPONSE_HEADERS_H_
-#define NET_HTTP_RESPONSE_HEADERS_H_
+#ifndef NET_HTTP_HTTP_RESPONSE_HEADERS_H_
+#define NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 
 #include <string>
 #include <vector>
@@ -304,4 +304,4 @@ class HttpResponseHeaders :
 
 }  // namespace net
 
-#endif  // NET_HTTP_RESPONSE_HEADERS_H_
+#endif  // NET_HTTP_HTTP_RESPONSE_HEADERS_H_
diff --git a/net/http/http_version.h b/net/http/http_version.h
index f6fe70b..127e711 100644
--- a/net/http/http_version.h
+++ b/net/http/http_version.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_HTTP_VERSION_H_
-#define NET_HTTP_VERSION_H_
+#ifndef NET_HTTP_HTTP_VERSION_H_
+#define NET_HTTP_HTTP_VERSION_H_
 
 #include "base/basictypes.h"
 
@@ -55,4 +55,4 @@ class HttpVersion {
 
 }  // namespace net
 
-#endif  // NET_HTTP_VERSION_H_
+#endif  // NET_HTTP_HTTP_VERSION_H_
diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
index 260112c..b51e54f 100644
--- a/net/proxy/proxy_server.h
+++ b/net/proxy/proxy_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_PROXY_SERVER_H_
-#define NET_PROXY_SERVER_H_
+#ifndef NET_PROXY_PROXY_SERVER_H_
+#define NET_PROXY_PROXY_SERVER_H_
 
 #include <string>
 
@@ -118,4 +118,4 @@ class ProxyServer {
 
 }  // namespace net
 
-#endif  // NET_PROXY_SERVER_H_
+#endif  // NET_PROXY_PROXY_SERVER_H_
diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h
index 0879948..88f54c2 100644
--- a/net/url_request/url_request_simple_job.h
+++ b/net/url_request/url_request_simple_job.h
@@ -35,4 +35,4 @@ class URLRequestSimpleJob : public URLRequestJob {
   int data_offset_;
 };
 
-#endif  // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H_
+#endif  // NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_