Cleanup EOL and include guards, including fixing one guard that was not the correct path. Lack of EOL on bloom_filter.h had broken the Linux build, this is a fatal warning with GCC.

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

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

17 files changed, 27 insertions, 38 deletions

diff --git a/chrome/browser/safe_browsing/bloom_filter.cc b/chrome/browser/safe_browsing/bloom_filter.cc
index c87da9e..1187e4e 100644
--- a/chrome/browser/safe_browsing/bloom_filter.cc
+++ b/chrome/browser/safe_browsing/bloom_filter.cc
@@ -58,4 +58,3 @@ uint32 BloomFilter::RotateLeft(uint32 hash) {
   hash |= left_byte;
   return hash;
 }
-
diff --git a/chrome/browser/safe_browsing/bloom_filter.h b/chrome/browser/safe_browsing/bloom_filter.h
index bb25d75..6b94745 100644
--- a/chrome/browser/safe_browsing/bloom_filter.h
+++ b/chrome/browser/safe_browsing/bloom_filter.h
@@ -5,8 +5,8 @@
 // A simple bloom filter.  It's currently limited to four hashing functions,
 // which are calculated from the item's hash.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H__
-#define CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H_
 
 #include "base/scoped_ptr.h"
 #include "base/basictypes.h"
@@ -35,4 +35,4 @@ class BloomFilter {
   scoped_array<char> data_;
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H__
\ No newline at end of file
+#endif  // CHROME_BROWSER_SAFE_BROWSING_BLOOM_FILTER_H_
diff --git a/chrome/browser/safe_browsing/bloom_filter_unittest.cc b/chrome/browser/safe_browsing/bloom_filter_unittest.cc
index a4ae8ca..1612084 100644
--- a/chrome/browser/safe_browsing/bloom_filter_unittest.cc
+++ b/chrome/browser/safe_browsing/bloom_filter_unittest.cc
@@ -76,4 +76,3 @@ TEST(SafeBrowsing, BloomFilter) {
   LOG(INFO) << "For safe browsing bloom filter of size " << count <<
       ", the FP rate was " << fp_rate << " %";
 }
-
diff --git a/chrome/browser/safe_browsing/chunk_range.h b/chrome/browser/safe_browsing/chunk_range.h
index 42075aa..d547dea 100644
--- a/chrome/browser/safe_browsing/chunk_range.h
+++ b/chrome/browser/safe_browsing/chunk_range.h
@@ -11,8 +11,8 @@
 // class is a simple and compact mechanism for storing a continuous list of
 // chunk numbers.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H__
-#define CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H_
 
 #include <string>
 #include <vector>
@@ -61,4 +61,4 @@ bool StringToRanges(const std::string& input,
                     std::vector<ChunkRange>* ranges);
 
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_CHUNK_RANGE_H_
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 84b9882..3e3c12b 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -561,4 +561,3 @@ void SafeBrowsingProtocolManager::HandleGetHashError() {
   int next = GetNextBackOffTime(&gethash_error_count_, &gethash_back_off_mult_);
   next_gethash_time_ = Time::Now() + TimeDelta::FromSeconds(next);
 }
-
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index c107a00..178aecd 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.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 CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H__
-#define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing protocol.
 // The SafeBrowsingProtocolManager handles formatting and making requests of,
@@ -204,4 +204,4 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
   DISALLOW_EVIL_CONSTRUCTORS(SafeBrowsingProtocolManager);
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
diff --git a/chrome/browser/safe_browsing/protocol_parser.h b/chrome/browser/safe_browsing/protocol_parser.h
index 76b9e41..fe87549 100644
--- a/chrome/browser/safe_browsing/protocol_parser.h
+++ b/chrome/browser/safe_browsing/protocol_parser.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 CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H__
-#define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H_
 
 // Parse the data returned from the chunk response.
 //
@@ -125,4 +125,4 @@ class SafeBrowsingProtocolParser {
 };
 
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_PARSER_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 0a9d6cf..e361800 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -330,4 +330,3 @@ void SafeBrowsingBlockingPage::NotifyDone() {
       &SafeBrowsingService::OnBlockingPageDone,
       this, client_, proceed_));
 }
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
index adb1901..405a3e3 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
@@ -18,8 +18,8 @@
 // SafeBrowsingService so that we can cancel the request for the new page, or
 // or allow it to continue.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H__
-#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 
 #include "base/logging.h"
 #include "chrome/browser/interstitial_page_delegate.h"
@@ -107,4 +107,4 @@ class SafeBrowsingBlockingPage
   DISALLOW_EVIL_CONSTRUCTORS(SafeBrowsingBlockingPage);
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 794020e..b481ba5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.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 CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
-#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H_
 
 #include <deque>
 #include <string>
@@ -102,4 +102,4 @@ class SafeBrowsingDatabase {
   scoped_ptr<BloomFilter> bloom_filter_;
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_impl.cc b/chrome/browser/safe_browsing/safe_browsing_database_impl.cc
index 556f780..3dc123b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_impl.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_impl.cc
@@ -1213,4 +1213,3 @@ void SafeBrowsingDatabaseImpl::OnResumeDone() {
 void SafeBrowsingDatabaseImpl::SetSynchronous() {
   asynchronous_ = false;
 }
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_impl.h b/chrome/browser/safe_browsing/safe_browsing_database_impl.h
index 8d5e0fe..67f44ea 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_impl.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database_impl.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 CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H__
-#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H_
 
 #include <deque>
 #include <list>
@@ -280,4 +280,4 @@ class SafeBrowsingDatabaseImpl : public SafeBrowsingDatabase {
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseImpl);
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H__
\ No newline at end of file
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_IMPL_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_impl_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_impl_unittest.cc
index 1077525..6469c33 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_impl_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_impl_unittest.cc
@@ -223,6 +223,3 @@ TEST(SafeBrowsingDatabaseImpl, HashCaching) {
   // Prefix miss cache should be cleared.
   EXPECT_EQ(database.prefix_miss_cache_.size(), 0);
 }
-
-
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 48c4fb1..78ce5a3 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -479,4 +479,3 @@ TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldLotsofDeletesIO) {
   deletes->push_back(del);
   PeformUpdate(L"old\\SafeBrowsing", chunks, deletes);
 }
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 478fee4..0ae4bfa 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -5,8 +5,8 @@
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
-#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 
 #include <deque>
 #include <set>
@@ -253,4 +253,4 @@ class SafeBrowsingService
   DISALLOW_EVIL_CONSTRUCTORS(SafeBrowsingService);
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H__
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 13409ed..23effa5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -615,4 +615,3 @@ bool SBHostInfo::GetNextEntry(const SBEntry** entry) {
 
   return false;
 }
-
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h
index f43d85b..1e40323 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.h
+++ b/chrome/browser/safe_browsing/safe_browsing_util.h
@@ -4,8 +4,8 @@
 //
 // Utilities for the SafeBrowsing code.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_UTIL_H__
-#define CHROME_BROWSER_SAFE_BROWSING_UTIL_H__
+#ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
 
 #include <string.h>
 
@@ -299,5 +299,4 @@ GURL GeneratePhishingReportUrl(const std::string& report_page,
 
 }  // namespace safe_browsing_util
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_UTIL_H__
-
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_