| 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 3df0e4e4d713f79bac54c809a9b69d906d1194ed..9ff86585c0183d7dd8fd7ada052ed5939f3ced7f 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 {
|
| + virtual void ImportStarted() override {}
|
| + virtual void ImportItemStarted(importer::ImportItem item) override {}
|
| + virtual void ImportItemEnded(importer::ImportItem item) override {}
|
| + virtual void ImportEnded() override {
|
| base::MessageLoop::current()->Quit();
|
| EXPECT_EQ(arraysize(kFirefoxBookmarks), bookmark_count_);
|
| EXPECT_EQ(1U, history_count_);
|
| @@ -138,16 +138,16 @@ class FirefoxObserver : public ProfileWriter,
|
| EXPECT_EQ(arraysize(kFirefoxKeywords), keyword_count_);
|
| }
|
|
|
| - virtual bool BookmarkModelIsLoaded() const OVERRIDE {
|
| + virtual bool BookmarkModelIsLoaded() const override {
|
| // Profile is ready for writing.
|
| return true;
|
| }
|
|
|
| - virtual bool TemplateURLServiceIsLoaded() const OVERRIDE {
|
| + virtual bool TemplateURLServiceIsLoaded() const override {
|
| return true;
|
| }
|
|
|
| - virtual void AddPasswordForm(const autofill::PasswordForm& form) OVERRIDE {
|
| + virtual 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);
|
| @@ -161,7 +161,7 @@ class FirefoxObserver : public ProfileWriter,
|
| }
|
|
|
| virtual void AddHistoryPage(const history::URLRows& page,
|
| - history::VisitSource visit_source) OVERRIDE {
|
| + 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());
|
| @@ -176,7 +176,7 @@ class FirefoxObserver : public ProfileWriter,
|
|
|
| virtual void AddBookmarks(
|
| const std::vector<ImportedBookmarkEntry>& bookmarks,
|
| - const base::string16& top_level_folder_name) OVERRIDE {
|
| + 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.
|
| @@ -189,7 +189,7 @@ class FirefoxObserver : public ProfileWriter,
|
| }
|
|
|
| virtual void AddAutofillFormDataEntries(
|
| - const std::vector<autofill::AutofillEntry>& autofill_entries) OVERRIDE {
|
| + const std::vector<autofill::AutofillEntry>& autofill_entries) override {
|
| EXPECT_EQ(arraysize(kFirefoxAutofillEntries), autofill_entries.size());
|
| for (size_t i = 0; i < arraysize(kFirefoxAutofillEntries); ++i) {
|
| EXPECT_EQ(kFirefoxAutofillEntries[i].name,
|
| @@ -200,7 +200,7 @@ class FirefoxObserver : public ProfileWriter,
|
| }
|
|
|
| virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
|
| - bool unique_on_host_and_path) OVERRIDE {
|
| + 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.
|
| @@ -223,7 +223,7 @@ class FirefoxObserver : public ProfileWriter,
|
| }
|
|
|
| virtual void AddFavicons(
|
| - const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE {
|
| + const std::vector<ImportedFaviconUsage>& favicons) override {
|
| }
|
|
|
| private:
|
| @@ -248,7 +248,7 @@ class FirefoxObserver : public ProfileWriter,
|
| // supported platforms.
|
| class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| // Creates a new profile in a new subdirectory in the temp directory.
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| base::FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest");
|
|
|