diff options
Diffstat (limited to 'chrome/browser/sync/test/integration/bookmarks_helper.cc')
-rw-r--r-- | chrome/browser/sync/test/integration/bookmarks_helper.cc | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index 780040c..1874a49 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -49,17 +49,17 @@ class HistoryEmptyTask : public history::HistoryDBTask { public: explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {} - virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) override { + bool RunOnDBThread(history::HistoryBackend* backend, + history::HistoryDatabase* db) override { content::RunAllPendingInMessageLoop(); done_->Signal(); return true; } - virtual void DoneRunOnMainThread() override {} + void DoneRunOnMainThread() override {} private: - virtual ~HistoryEmptyTask() {} + ~HistoryEmptyTask() override {} base::WaitableEvent* done_; }; @@ -74,9 +74,7 @@ class FaviconChangeObserver : public BookmarkModelObserver { wait_for_load_(false) { model->AddObserver(this); } - virtual ~FaviconChangeObserver() { - model_->RemoveObserver(this); - } + ~FaviconChangeObserver() override { model_->RemoveObserver(this); } void WaitForGetFavicon() { wait_for_load_ = true; content::RunMessageLoop(); @@ -87,37 +85,34 @@ class FaviconChangeObserver : public BookmarkModelObserver { wait_for_load_ = false; content::RunMessageLoop(); } - virtual void BookmarkModelLoaded(BookmarkModel* model, - bool ids_reassigned) override {} - virtual void BookmarkNodeMoved(BookmarkModel* model, - const BookmarkNode* old_parent, - int old_index, - const BookmarkNode* new_parent, - int new_index) override {} - virtual void BookmarkNodeAdded(BookmarkModel* model, - const BookmarkNode* parent, - int index) override {} - virtual void BookmarkNodeRemoved( - BookmarkModel* model, - const BookmarkNode* parent, - int old_index, - const BookmarkNode* node, - const std::set<GURL>& removed_urls) override {} - virtual void BookmarkAllUserNodesRemoved( + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override { + } + void BookmarkNodeMoved(BookmarkModel* model, + const BookmarkNode* old_parent, + int old_index, + const BookmarkNode* new_parent, + int new_index) override {} + void BookmarkNodeAdded(BookmarkModel* model, + const BookmarkNode* parent, + int index) override {} + void BookmarkNodeRemoved(BookmarkModel* model, + const BookmarkNode* parent, + int old_index, + const BookmarkNode* node, + const std::set<GURL>& removed_urls) override {} + void BookmarkAllUserNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) override {} - virtual void BookmarkNodeChanged(BookmarkModel* model, - const BookmarkNode* node) override { + void BookmarkNodeChanged(BookmarkModel* model, + const BookmarkNode* node) override { if (model == model_ && node == node_) model->GetFavicon(node); } - virtual void BookmarkNodeChildrenReordered( - BookmarkModel* model, - const BookmarkNode* node) override {} - virtual void BookmarkNodeFaviconChanged( - BookmarkModel* model, - const BookmarkNode* node) override { + void BookmarkNodeChildrenReordered(BookmarkModel* model, + const BookmarkNode* node) override {} + void BookmarkNodeFaviconChanged(BookmarkModel* model, + const BookmarkNode* node) override { if (model == model_ && node == node_) { if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) base::MessageLoopForUI::current()->Quit(); @@ -709,10 +704,10 @@ namespace { class AllModelsMatchChecker : public MultiClientStatusChangeChecker { public: AllModelsMatchChecker(); - virtual ~AllModelsMatchChecker(); + ~AllModelsMatchChecker() override; - virtual bool IsExitConditionSatisfied() override; - virtual std::string GetDebugMessage() const override; + bool IsExitConditionSatisfied() override; + std::string GetDebugMessage() const override; }; AllModelsMatchChecker::AllModelsMatchChecker() |