Standardize usage of virtual/override/final in chrome/browser/

chrome/browser/importer/firefox_importer_browsertest.cc

Index: chrome/browser/importer/firefox_importer_browsertest.cc
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc
index 9ff86585c0183d7dd8fd7ada052ed5939f3ced7f..b2c00004c233b1ccf3e569151c097c06d8f47b85 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -127,10 +127,10 @@ class FirefoxObserver : public ProfileWriter,
         use_keyword_in_json_(use_keyword_in_json) {}
 
   // importer::ImporterProgressObserver:
-  virtual void ImportStarted() override {}
-  virtual void ImportItemStarted(importer::ImportItem item) override {}
-  virtual void ImportItemEnded(importer::ImportItem item) override {}
-  virtual void ImportEnded() override {
+  void ImportStarted() override {}
+  void ImportItemStarted(importer::ImportItem item) override {}
+  void ImportItemEnded(importer::ImportItem item) override {}
+  void ImportEnded() override {
     base::MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kFirefoxBookmarks), bookmark_count_);
     EXPECT_EQ(1U, history_count_);
@@ -138,16 +138,14 @@ class FirefoxObserver : public ProfileWriter,
     EXPECT_EQ(arraysize(kFirefoxKeywords), keyword_count_);
   }
 
-  virtual bool BookmarkModelIsLoaded() const override {
+  bool BookmarkModelIsLoaded() const override {
     // Profile is ready for writing.
     return true;
   }
 
-  virtual bool TemplateURLServiceIsLoaded() const override {
-    return true;
-  }
+  bool TemplateURLServiceIsLoaded() const override { return true; }
 
-  virtual void AddPasswordForm(const autofill::PasswordForm& form) override {
+  void AddPasswordForm(const autofill::PasswordForm& form) override {
     PasswordInfo p = kFirefoxPasswords[password_count_];
     EXPECT_EQ(p.origin, form.origin.spec());
     EXPECT_EQ(p.realm, form.signon_realm);
@@ -160,8 +158,8 @@ class FirefoxObserver : public ProfileWriter,
     ++password_count_;
   }
 
-  virtual void AddHistoryPage(const history::URLRows& page,
-                              history::VisitSource visit_source) override {
+  void AddHistoryPage(const history::URLRows& page,
+                      history::VisitSource visit_source) override {
     ASSERT_EQ(3U, page.size());
     EXPECT_EQ("http://www.google.com/", page[0].url().spec());
     EXPECT_EQ(base::ASCIIToUTF16("Google"), page[0].title());
@@ -174,9 +172,8 @@ class FirefoxObserver : public ProfileWriter,
     ++history_count_;
   }
 
-  virtual void AddBookmarks(
-      const std::vector<ImportedBookmarkEntry>& bookmarks,
-      const base::string16& top_level_folder_name) override {
+  void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,
+                    const base::string16& top_level_folder_name) override {
     ASSERT_LE(bookmark_count_ + bookmarks.size(), arraysize(kFirefoxBookmarks));
     // Importer should import the FF favorites the same as the list, in the same
     // order.
@@ -188,7 +185,7 @@ class FirefoxObserver : public ProfileWriter,
     }
   }
 
-  virtual void AddAutofillFormDataEntries(
+  void AddAutofillFormDataEntries(
       const std::vector<autofill::AutofillEntry>& autofill_entries) override {
     EXPECT_EQ(arraysize(kFirefoxAutofillEntries), autofill_entries.size());
     for (size_t i = 0; i < arraysize(kFirefoxAutofillEntries); ++i) {
@@ -199,8 +196,8 @@ class FirefoxObserver : public ProfileWriter,
     }
   }
 
-  virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
-                           bool unique_on_host_and_path) override {
+  void AddKeywords(ScopedVector<TemplateURL> template_urls,
+                   bool unique_on_host_and_path) override {
     for (size_t i = 0; i < template_urls.size(); ++i) {
       // The order might not be deterministic, look in the expected list for
       // that template URL.
@@ -222,12 +219,11 @@ class FirefoxObserver : public ProfileWriter,
     }
   }
 
-  virtual void AddFavicons(
-      const std::vector<ImportedFaviconUsage>& favicons) override {
+  void AddFavicons(const std::vector<ImportedFaviconUsage>& favicons) override {
   }
 
  private:
-  virtual ~FirefoxObserver() {}
+  ~FirefoxObserver() override {}
 
   size_t bookmark_count_;
   size_t history_count_;