Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition.

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047

Review URL: https://codereview.chromium.org/12212048

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

17 files changed, 44 insertions, 40 deletions

diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index 317fd99..836043a 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -48,7 +48,7 @@ const int kEarlyExpirationAdvanceDays = 3;
 class AllVisitsReader : public ExpiringVisitsReader {
  public:
   virtual bool Read(Time end_time, HistoryDatabase* db,
-                    VisitVector* visits, int max_visits) const {
+                    VisitVector* visits, int max_visits) const OVERRIDE {
     DCHECK(db) << "must have a database to operate upon";
     DCHECK(visits) << "visit vector has to exist in order to populate it";
 
@@ -68,7 +68,7 @@ class AllVisitsReader : public ExpiringVisitsReader {
 class AutoSubframeVisitsReader : public ExpiringVisitsReader {
  public:
   virtual bool Read(Time end_time, HistoryDatabase* db,
-                    VisitVector* visits, int max_visits) const {
+                    VisitVector* visits, int max_visits) const OVERRIDE {
     DCHECK(db) << "must have a database to operate upon";
     DCHECK(visits) << "visit vector has to exist in order to populate it";
 
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 5912024..cb18bd9 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -127,7 +127,7 @@ class ExpireHistoryTest : public testing::Test,
   NotificationList notifications_;
 
  private:
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
 
     FilePath history_name = path().Append(kHistoryFile);
@@ -157,7 +157,7 @@ class ExpireHistoryTest : public testing::Test,
     top_sites_ = profile_.GetTopSites();
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     top_sites_ = NULL;
 
     ClearLastNotifications();
@@ -171,8 +171,9 @@ class ExpireHistoryTest : public testing::Test,
   }
 
   // BroadcastNotificationDelegate implementation.
-  void BroadcastNotifications(int type,
-                              HistoryDetails* details_deleted) {
+  virtual void BroadcastNotifications(
+      int type,
+      HistoryDetails* details_deleted) OVERRIDE {
     // This gets called when there are notifications to broadcast. Instead, we
     // store them so we can tell that the correct notifications were sent.
     notifications_.push_back(std::make_pair(type, details_deleted));
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 29ee9f3..be34d0f 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -43,11 +43,11 @@ class WaitForHistoryTask : public HistoryDBTask {
   WaitForHistoryTask() {}
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) {
+                             history::HistoryDatabase* db) OVERRIDE {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() {
+  virtual void DoneRunOnMainThread() OVERRIDE {
     MessageLoop::current()->Quit();
   }
 
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index f940743..5449c7f 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -106,7 +106,7 @@ class HistoryBackendDBTest : public HistoryUnitTestBase {
   HistoryBackendDBTest() : db_(NULL) {
   }
 
-  ~HistoryBackendDBTest() {
+  virtual ~HistoryBackendDBTest() {
   }
 
  protected:
@@ -564,7 +564,7 @@ class HistoryTest : public testing::Test {
         query_url_success_(false) {
   }
 
-  ~HistoryTest() {
+  virtual ~HistoryTest() {
   }
 
   void OnSegmentUsageAvailable(CancelableRequestProvider::Handle handle,
@@ -1189,11 +1189,12 @@ class HistoryDBTaskImpl : public HistoryDBTask {
 
   HistoryDBTaskImpl() : invoke_count(0), done_invoked(false) {}
 
-  virtual bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) {
+  virtual bool RunOnDBThread(HistoryBackend* backend,
+                             HistoryDatabase* db) OVERRIDE {
     return (++invoke_count == kWantInvokeCount);
   }
 
-  virtual void DoneRunOnMainThread() {
+  virtual void DoneRunOnMainThread() OVERRIDE {
     done_invoked = true;
     MessageLoop::current()->Quit();
   }
diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc
index 3b7e0e68..e0590e3 100644
--- a/chrome/browser/history/in_memory_url_index_unittest.cc
+++ b/chrome/browser/history/in_memory_url_index_unittest.cc
@@ -385,7 +385,7 @@ void InMemoryURLIndexTest::ExpectPrivateDataEqual(
 
 class LimitedInMemoryURLIndexTest : public InMemoryURLIndexTest {
  protected:
-  FilePath::StringType TestDBName() const;
+  virtual FilePath::StringType TestDBName() const OVERRIDE;
 };
 
 FilePath::StringType LimitedInMemoryURLIndexTest::TestDBName() const {
diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc
index 2e40265..2c6d0ae7 100644
--- a/chrome/browser/history/multipart_browsertest.cc
+++ b/chrome/browser/history/multipart_browsertest.cc
@@ -19,8 +19,9 @@ class MultipartResponseTest : public InProcessBrowserTest,
   MultipartResponseTest() : did_navigate_any_frame_count_(0),
                             update_history_count_(0) {}
 
-  void DidNavigateAnyFrame(const content::LoadCommittedDetails& details,
-                           const content::FrameNavigateParams& params) {
+  virtual void DidNavigateAnyFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) OVERRIDE {
     did_navigate_any_frame_count_++;
     if (params.should_update_history)
       update_history_count_++;
diff --git a/chrome/browser/history/scored_history_match_unittest.cc b/chrome/browser/history/scored_history_match_unittest.cc
index 77def64..35d512d 100644
--- a/chrome/browser/history/scored_history_match_unittest.cc
+++ b/chrome/browser/history/scored_history_match_unittest.cc
@@ -276,7 +276,7 @@ class BookmarkServiceMock : public BookmarkService {
   virtual ~BookmarkServiceMock() {}
 
   // Returns true if the given |url| is the same as |url_|.
-  bool IsBookmarked(const GURL& url) OVERRIDE;
+  virtual bool IsBookmarked(const GURL& url) OVERRIDE;
 
   // Required but unused.
   virtual void GetBookmarks(std::vector<URLAndTitle>* bookmarks) OVERRIDE {}
diff --git a/chrome/browser/history/shortcuts_backend_unittest.cc b/chrome/browser/history/shortcuts_backend_unittest.cc
index 2a5e120..7cf24c4 100644
--- a/chrome/browser/history/shortcuts_backend_unittest.cc
+++ b/chrome/browser/history/shortcuts_backend_unittest.cc
@@ -33,8 +33,8 @@ class ShortcutsBackendTest : public testing::Test,
         load_notified_(false),
         changed_notified_(false) {}
 
-  void SetUp();
-  void TearDown();
+  virtual void SetUp();
+  virtual void TearDown();
 
   virtual void OnShortcutsLoaded() OVERRIDE;
   virtual void OnShortcutsChanged() OVERRIDE;
diff --git a/chrome/browser/history/shortcuts_database_unittest.cc b/chrome/browser/history/shortcuts_database_unittest.cc
index 23b9049..a46346a 100644
--- a/chrome/browser/history/shortcuts_database_unittest.cc
+++ b/chrome/browser/history/shortcuts_database_unittest.cc
@@ -42,8 +42,8 @@ struct ShortcutsDatabaseTestInfo {
 
 class ShortcutsDatabaseTest : public testing::Test {
  public:
-  void SetUp();
-  void TearDown();
+  virtual void SetUp();
+  virtual void TearDown();
 
   void ClearDB();
   size_t CountRecords() const;
diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc
index 9316729..a14e051 100644
--- a/chrome/browser/history/text_database_manager_unittest.cc
+++ b/chrome/browser/history/text_database_manager_unittest.cc
@@ -51,11 +51,11 @@ class InMemDB : public URLDatabase, public VisitDatabase {
     CreateURLTable(false);
     InitVisitTable();
   }
-  ~InMemDB() {
+  virtual ~InMemDB() {
   }
 
  private:
-  virtual sql::Connection& GetDB() { return db_; }
+  virtual sql::Connection& GetDB() OVERRIDE { return db_; }
 
   sql::Connection db_;
 
@@ -157,10 +157,10 @@ class TextDatabaseManagerTest : public testing::Test {
   }
 
  protected:
-  void SetUp() {
+  virtual void SetUp() {
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     file_util::Delete(dir_, true);
   }
 
diff --git a/chrome/browser/history/text_database_unittest.cc b/chrome/browser/history/text_database_unittest.cc
index a25bc78..7161844 100644
--- a/chrome/browser/history/text_database_unittest.cc
+++ b/chrome/browser/history/text_database_unittest.cc
@@ -88,7 +88,7 @@ class TextDatabaseTest : public PlatformTest {
   TextDatabaseTest() {}
 
  protected:
-  void SetUp() {
+  virtual void SetUp() {
     PlatformTest::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index 2ba29df..a2524b8 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -55,7 +55,7 @@ class ThumbnailDatabaseTest : public testing::Test {
  public:
   ThumbnailDatabaseTest() {
   }
-  ~ThumbnailDatabaseTest() {
+  virtual ~ThumbnailDatabaseTest() {
   }
 
  protected:
@@ -89,7 +89,7 @@ class IconMappingMigrationTest : public HistoryUnitTestBase {
  public:
   IconMappingMigrationTest() {
   }
-  ~IconMappingMigrationTest() {
+  virtual ~IconMappingMigrationTest() {
   }
 
  protected:
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index d4d3779..565259d 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -121,7 +121,7 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
   }
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) {
+                             history::HistoryDatabase* db) OVERRIDE {
     // Get the most visited urls.
     backend->QueryMostVisitedURLsImpl(result_count_,
                                       kDaysOfHistory,
@@ -139,7 +139,7 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() {
+  virtual void DoneRunOnMainThread() OVERRIDE {
     top_sites_->FinishHistoryMigration(data_);
   }
 
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index ffcc9a1..fa824a8 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -52,11 +52,12 @@ class WaitForHistoryTask : public HistoryDBTask {
  public:
   WaitForHistoryTask() {}
 
-  virtual bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) {
+  virtual bool RunOnDBThread(HistoryBackend* backend,
+                             HistoryDatabase* db) OVERRIDE {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() {
+  virtual void DoneRunOnMainThread() OVERRIDE {
     MessageLoop::current()->Quit();
   }
 
@@ -362,7 +363,7 @@ class TopSitesMigrationTest : public TopSitesTest {
   }
 
   // Returns true if history and top sites should be created in SetUp.
-  virtual bool CreateHistoryAndTopSites() {
+  virtual bool CreateHistoryAndTopSites() OVERRIDE {
     return false;
   }
 
diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc
index c16ae01..e93536d 100644
--- a/chrome/browser/history/url_database_unittest.cc
+++ b/chrome/browser/history/url_database_unittest.cc
@@ -41,13 +41,13 @@ class URLDatabaseTest : public testing::Test,
 
  protected:
   // Provided for URL/VisitDatabase.
-  virtual sql::Connection& GetDB() {
+  virtual sql::Connection& GetDB() OVERRIDE {
     return db_;
   }
 
  private:
   // Test setup.
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     FilePath db_file = temp_dir_.path().AppendASCII("URLTest.db");
 
@@ -59,7 +59,7 @@ class URLDatabaseTest : public testing::Test,
     InitKeywordSearchTermsTable();
     CreateKeywordSearchTermsIndices();
   }
-  void TearDown() {
+  virtual void TearDown() {
     db_.Close();
   }
 
diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc
index 88745cb..caf10dd 100644
--- a/chrome/browser/history/visit_database_unittest.cc
+++ b/chrome/browser/history/visit_database_unittest.cc
@@ -45,7 +45,7 @@ class VisitDatabaseTest : public PlatformTest,
 
  private:
   // Test setup.
-  void SetUp() {
+  virtual void SetUp() {
     PlatformTest::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     FilePath db_file = temp_dir_.path().AppendASCII("VisitTest.db");
@@ -57,13 +57,13 @@ class VisitDatabaseTest : public PlatformTest,
     CreateMainURLIndex();
     InitVisitTable();
   }
-  void TearDown() {
+  virtual void TearDown() {
     db_.Close();
     PlatformTest::TearDown();
   }
 
   // Provided for URL/VisitDatabase.
-  virtual sql::Connection& GetDB() {
+  virtual sql::Connection& GetDB() OVERRIDE {
     return db_;
   }
 
diff --git a/chrome/browser/history/visit_filter_unittest.cc b/chrome/browser/history/visit_filter_unittest.cc
index a3f5aef..bc0b7b2 100644
--- a/chrome/browser/history/visit_filter_unittest.cc
+++ b/chrome/browser/history/visit_filter_unittest.cc
@@ -28,8 +28,8 @@ class VisitFilterTest : public testing::Test {
   VisitFilterTest();
 
  protected:
-  void SetUp();
-  void TearDown();
+  virtual void SetUp();
+  virtual void TearDown();
 };
 
 VisitFilterTest::VisitFilterTest() {