Fix header include guards.

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

14 files changed, 43 insertions, 43 deletions

diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
index 57b4316..ea62110 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -27,8 +27,8 @@
 // (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 LISTEN_SOCKET_UNITTEST_H__
-#define LISTEN_SOCKET_UNITTEST_H__
+#ifndef NET_BASE_LISTEN_SOCKET_UNITTEST_H_
+#define NET_BASE_LISTEN_SOCKET_UNITTEST_H_
 
 #include <winsock2.h>
 
@@ -289,4 +289,4 @@ class ListenSocketTester :
 
 }  // namespace
 
-#endif  // LISTEN_SOCKET_UNITTEST_H__
+#endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index ed0eac1..4e03b2f 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_H__
-#define BASE_URL_REQUEST_URL_REQUEST_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_H_
+#define NET_URL_REQUEST_URL_REQUEST_H_
 
 #include <string>
 #include <vector>
@@ -539,4 +539,4 @@ extern URLRequestMetrics url_request_metrics;
 #endif
 
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_H_
diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h
index f94f9a7..0c6ca6a 100644
--- a/net/url_request/url_request_about_job.h
+++ b/net/url_request/url_request_about_job.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H__
-#define BASE_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H_
 
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
@@ -46,4 +46,4 @@ class URLRequestAboutJob : public URLRequestJob {
   void StartAsync();
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H_
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index e23a6ba..e4cbee0 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -32,8 +32,8 @@
 // The class is reference-counted so that it can be cleaned up after any
 // requests that are using it have been completed.
 
-#ifndef BASE_URL_REQUEST_URL_REQUEST_CONTEXT_H__
-#define BASE_URL_REQUEST_URL_REQUEST_CONTEXT_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
+#define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
 
 #include <string>
 
@@ -104,4 +104,4 @@ class URLRequestContext :
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestContext);
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_CONTEXT_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h
index d93ca7f..5c61fc0 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -30,8 +30,8 @@
 // Invalid URLs go through this URLRequestJob class rather than being passed
 // to the default job handler.
 
-#ifndef BASE_URL_REQUEST_URL_REQUEST_ERROR_JOB_H__
-#define BASE_URL_REQUEST_URL_REQUEST_ERROR_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
 
 #include "net/url_request/url_request_job.h"
 
@@ -46,4 +46,4 @@ class URLRequestErrorJob : public URLRequestJob {
   void StartAsync();
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_ERROR_JOB_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index d5e63fb..076703f 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
-#define BASE_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
+#ifndef NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
 
 #include "base/lock.h"
 #include "base/message_loop.h"
@@ -94,4 +94,4 @@ class URLRequestFileJob : public URLRequestJob,
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestFileJob);
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
+#endif  // NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index 6bdb2bd..1143ff6 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -41,8 +41,8 @@
 // it through to URLRequestInetJob::Factory and lets the default network stack
 // handle it.
 
-#ifndef BASE_URL_REQUEST_URL_REQUEST_FILTER_H__
-#define BASE_URL_REQUEST_URL_REQUEST_FILTER_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_FILTER_H_
+#define NET_URL_REQUEST_URL_REQUEST_FILTER_H_
 
 #include <hash_map>
 #include <map>
@@ -102,4 +102,4 @@ class URLRequestFilter {
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestFilter);
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_FILTER_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_FILTER_H_
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 654262d..22e66b8e 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_FTP_JOB_H__
-#define BASE_URL_REQUEST_URL_REQUEST_FTP_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
 
 #include "net/url_request/url_request_inet_job.h"
 
@@ -130,4 +130,4 @@ class URLRequestFtpJob : public URLRequestInetJob {
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestFtpJob);
 };
 
-#endif  // #define BASE_URL_REQUEST_URL_REQUEST_FTP_JOB_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 9cb4a18..ea5539c 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_JOB_H__
-#define BASE_URL_REQUEST_URL_REQUEST_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_JOB_H_
 
 #include <vector>
 
@@ -333,4 +333,4 @@ class URLRequestJob : public base::RefCounted<URLRequestJob> {
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestJob);
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_JOB_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_
diff --git a/net/url_request/url_request_job_metrics.h b/net/url_request/url_request_job_metrics.h
index e6a9bc6..bf1f33a 100644
--- a/net/url_request/url_request_job_metrics.h
+++ b/net/url_request/url_request_job_metrics.h
@@ -30,6 +30,9 @@
 // Records IO statistics associated with a URLRequestJob.
 // See description in navigation_profiler.h for an overview of perf profiling.
 
+#ifndef NET_URL_REQUEST_URL_REQUEST_JOB_METRICS_H_
+#define NET_URL_REQUEST_URL_REQUEST_JOB_METRICS_H_
+
 #include <string>
 
 #include "base/basictypes.h"
@@ -37,9 +40,6 @@
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 
-#ifndef BASE_URL_REQUEST_URL_REQUEST_JOB_METRICS_H__
-#define BASE_URL_REQUEST_URL_REQUEST_JOB_METRICS_H__
-
 class URLRequestJobMetrics {
  public:
   URLRequestJobMetrics() : total_bytes_read_(0), number_of_read_IO_(0) { }
@@ -71,4 +71,4 @@ class URLRequestJobMetrics {
   void AppendText(std::wstring* text);
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_JOB_METRICS_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_JOB_METRICS_H_
diff --git a/net/url_request/url_request_job_tracker.h b/net/url_request/url_request_job_tracker.h
index ca5a380..d031e6c 100644
--- a/net/url_request/url_request_job_tracker.h
+++ b/net/url_request/url_request_job_tracker.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H__
-#define BASE_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H_
+#define NET_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H_
 
 #include <vector>
 
@@ -114,4 +114,4 @@ class URLRequestJobTracker {
 
 extern URLRequestJobTracker g_url_request_job_tracker;
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_JOB_TRACKER_H_
diff --git a/net/url_request/url_request_status.h b/net/url_request/url_request_status.h
index d0fa16a..3cd46f9 100644
--- a/net/url_request/url_request_status.h
+++ b/net/url_request/url_request_status.h
@@ -30,8 +30,8 @@
 // This file's dependencies should be kept to a minimum so that it can be
 // included in WebKit code that doesn't rely on much of common.
 
-#ifndef BASE_URL_REQUEST_URL_REQUEST_STATUS_H__
-#define BASE_URL_REQUEST_URL_REQUEST_STATUS_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_STATUS_H_
+#define NET_URL_REQUEST_URL_REQUEST_STATUS_H_
 
 // Respresents the result of a URL request. It encodes errors and various
 // types of success.
@@ -88,4 +88,4 @@ class URLRequestStatus {
   int os_error_;
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_STATUS_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_STATUS_H_
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index bc7a57b..811e021 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_TEST_JOB_H__
-#define BASE_URL_REQUEST_URL_REQUEST_TEST_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
 
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
@@ -107,4 +107,4 @@ class URLRequestTestJob : public URLRequestJob {
   int async_buf_size_;
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_TEST_JOB_H__
+#endif  // NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index d8a8809..81b063b 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -27,8 +27,8 @@
 // (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 BASE_URL_REQUEST_URL_REQUEST_UNITTEST_H_
-#define BASE_URL_REQUEST_URL_REQUEST_UNITTEST_H_
+#ifndef NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
+#define NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
 
 #include <sstream>
 #include <string>
@@ -377,4 +377,4 @@ class HTTPSTestServer : public TestServer {
   virtual std::string scheme() { return std::string("https"); }
 };
 
-#endif  // BASE_URL_REQUEST_URL_REQUEST_UNITTEST_H_
+#endif  // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_