Fixes almost all of the rest of lint errors in the chrome/ directory (minus the really hard ones which will need actual review instead of rubber-stamping.)

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

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

9 files changed, 15 insertions, 38 deletions

diff --git a/chrome/browser/history/expire_history_backend.h b/chrome/browser/history/expire_history_backend.h
index dc37044..149bcce 100644
--- a/chrome/browser/history/expire_history_backend.h
+++ b/chrome/browser/history/expire_history_backend.h
@@ -96,7 +96,7 @@ class ExpireHistoryBackend {
   }
 
  private:
-  //friend class ExpireHistoryTest_DeleteFaviconsIfPossible_Test;
+  // friend class ExpireHistoryTest_DeleteFaviconsIfPossible_Test;
   FRIEND_TEST(ExpireHistoryTest, DeleteTextIndexForURL);
   FRIEND_TEST(ExpireHistoryTest, DeleteFaviconsIfPossible);
   FRIEND_TEST(ExpireHistoryTest, ArchiveSomeOldHistory);
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index 560b699..3bb8520 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -41,7 +41,7 @@ class HistoryDatabase : public DownloadDatabase,
   // support rollback since the history database doesn't, either.
   class TransactionScoper {
    public:
-    TransactionScoper(HistoryDatabase* db) : db_(db) {
+    explicit TransactionScoper(HistoryDatabase* db) : db_(db) {
       db_->BeginTransaction();
     }
     ~TransactionScoper() {
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index d6decb3..71d7364 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.h
@@ -37,7 +37,7 @@ class HistoryAddPageArgs
         referrer(arg_referrer),
         redirects(arg_redirects),
         transition(arg_transition),
-        did_replace_entry(arg_did_replace_entry){
+        did_replace_entry(arg_did_replace_entry) {
   }
 
   GURL url;
diff --git a/chrome/browser/history/history_notifications.h b/chrome/browser/history/history_notifications.h
index 5af5eb2..80fc9d5 100644
--- a/chrome/browser/history/history_notifications.h
+++ b/chrome/browser/history/history_notifications.h
@@ -54,7 +54,7 @@ struct URLsDeletedDetails : public HistoryDetails {
 
 // Details for NOTIFY_URLS_STARRED.
 struct URLsStarredDetails : public HistoryDetails {
-  URLsStarredDetails(bool being_starred) : starred(being_starred) {}
+  explicit URLsStarredDetails(bool being_starred) : starred(being_starred) {}
 
   // The new starred state of the list of URLs. True when they are being
   // starred, false when they are being unstarred.
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index 9f28cf2..62460dd 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_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_HISTORY_HISTORY_MEMORY_DB_H_
-#define CHROME_BROWSER_HISTORY_HISTORY_MEMORY_DB_H_
+#ifndef CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
+#define CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
 
 #include <string>
 
@@ -48,4 +48,4 @@ class InMemoryDatabase : public URLDatabase {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_HISTORY_MEMORY_DB_H_
+#endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index b421c5f..fe109d5 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -77,4 +77,4 @@ class InMemoryHistoryBackend : public NotificationObserver {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_IN_MEMORY_HISTORY_BACKEND_H_
+#endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_HISTORY_BACKEND_H_
diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h
index 9e45317..66a63e2 100644
--- a/chrome/browser/history/page_usage_data.h
+++ b/chrome/browser/history/page_usage_data.h
@@ -23,7 +23,7 @@ class SkBitmap;
 /////////////////////////////////////////////////////////////////////////////
 class PageUsageData {
  public:
-  PageUsageData(history::URLID id)
+  explicit PageUsageData(history::URLID id)
       : id_(id),
         thumbnail_(NULL),
         thumbnail_set_(false),
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index 8ce38da..60b8985 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -111,29 +111,6 @@ InitStatus ThumbnailDatabase::Init(const FilePath& db_name,
     return INIT_FAILURE;
   }
 
-  // The following code is useful in debugging the thumbnail database. Upon
-  // startup, it will spit out a file for each thumbnail in the database so you
-  // can open them in an external viewer. Insert the path name on your system
-  // into the string below (I recommend using a blank directory since there may
-  // be a lot of files).
-#if 0
-  sql::Statement statement(db_.GetUniqueStatement(
-      "SELECT id, image_data FROM favicons"));
-  while (statement.Step()) {
-    int idx = statement.ColumnInt(0);
-    std::vector<unsigned char> data;
-    statement.ColumnBlobAsVector(1, &data);
-
-    char filename[256];
-    sprintf(filename, "<<< YOUR PATH HERE >>>\\%d.png", idx);
-    if (!data.empty()) {
-      file_util::WriteFile(ASCIIToWide(std::string(filename)),
-                           reinterpret_cast<char*>(&data[0]),
-                           data.size());
-    }
-  }
-#endif
-
   return INIT_OK;
 }
 
diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
index 4294578..cce4606 100644
--- a/chrome/browser/history/top_sites.h
+++ b/chrome/browser/history/top_sites.h
@@ -51,8 +51,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
                         const SkBitmap& thumbnail,
                         const ThumbnailScore& score);
 
-  //TODO(brettw) write this.
-  //bool GetPageThumbnail(const GURL& url, RefCountedBytes** data) const;
+  // TODO(brettw): write this.
+  // bool GetPageThumbnail(const GURL& url, RefCountedBytes** data) const;
 
  private:
   friend class TopSitesTest;
@@ -61,8 +61,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
     scoped_refptr<RefCountedBytes> thumbnail;
     ThumbnailScore thumbnail_score;
 
-    // TODO(brettw) this will eventually store the favicon.
-    //scoped_refptr<RefCountedBytes> favicon;
+    // TODO(brettw): this will eventually store the favicon.
+    // scoped_refptr<RefCountedBytes> favicon;
   };
 
   // Saves the set of the top URLs visited by this user. The 0th item is the
@@ -118,8 +118,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
   // maps the redirects to the index into top_sites_ that contains it.
   std::map<GURL, size_t> canonical_urls_;
 
-  // TODO(brettw) use the blacklist.
-  //std::set<GURL> blacklist_;
+  // TODO(brettw): use the blacklist.
+  // std::set<GURL> blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSites);
 };