Index: chrome/browser/importer/ie_importer_browsertest_win.cc |
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc |
index 27d06c8c792b7a5c75d854b1f1a3a2460ce05b24..51e7dd9cff49a9e9fe6f5fb85b337d694024e20c 100644 |
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc |
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc |
@@ -232,10 +232,10 @@ class TestObserver : public ProfileWriter, |
} |
// 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(); |
if (importer_items_ & importer::FAVORITES) { |
EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_); |
@@ -286,7 +286,7 @@ class TestObserver : 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(kIEBookmarks)); |
// Importer should import the IE Favorites folder the same as the list, |
// in the same order. |
@@ -307,7 +307,7 @@ class TestObserver : public ProfileWriter, |
} |
virtual void AddFavicons( |
- const std::vector<ImportedFaviconUsage>& usage) OVERRIDE { |
+ const std::vector<ImportedFaviconUsage>& usage) override { |
// Importer should group the favicon information for each favicon URL. |
for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) { |
GURL favicon_url(kIEFaviconGroup[i].favicon_url); |
@@ -368,10 +368,10 @@ class MalformedFavoritesRegistryTestObserver |
} |
// 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(kIESortedBookmarks), bookmark_count_); |
} |
@@ -386,7 +386,7 @@ class MalformedFavoritesRegistryTestObserver |
int default_keyword_index) {} |
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(kIESortedBookmarks)); |
for (size_t i = 0; i < bookmarks.size(); ++i) { |
@@ -409,7 +409,7 @@ class MalformedFavoritesRegistryTestObserver |
// import (via ExternalProcessImporterHost) which launches a utility process. |
class IEImporterBrowserTest : public InProcessBrowserTest { |
protected: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
// This will launch the browser test and thus needs to happen last. |