Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(797)

Side by Side Diff: chrome/browser/sync/test/integration/bookmarks_helper.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 namespace { 44 namespace {
45 45
46 // History task which runs all pending tasks on the history thread and 46 // History task which runs all pending tasks on the history thread and
47 // signals when the tasks have completed. 47 // signals when the tasks have completed.
48 class HistoryEmptyTask : public history::HistoryDBTask { 48 class HistoryEmptyTask : public history::HistoryDBTask {
49 public: 49 public:
50 explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {} 50 explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {}
51 51
52 virtual bool RunOnDBThread(history::HistoryBackend* backend, 52 virtual bool RunOnDBThread(history::HistoryBackend* backend,
53 history::HistoryDatabase* db) OVERRIDE { 53 history::HistoryDatabase* db) override {
54 content::RunAllPendingInMessageLoop(); 54 content::RunAllPendingInMessageLoop();
55 done_->Signal(); 55 done_->Signal();
56 return true; 56 return true;
57 } 57 }
58 58
59 virtual void DoneRunOnMainThread() OVERRIDE {} 59 virtual void DoneRunOnMainThread() override {}
60 60
61 private: 61 private:
62 virtual ~HistoryEmptyTask() {} 62 virtual ~HistoryEmptyTask() {}
63 63
64 base::WaitableEvent* done_; 64 base::WaitableEvent* done_;
65 }; 65 };
66 66
67 // Helper class used to wait for changes to take effect on the favicon of a 67 // Helper class used to wait for changes to take effect on the favicon of a
68 // particular bookmark node in a particular bookmark model. 68 // particular bookmark node in a particular bookmark model.
69 class FaviconChangeObserver : public BookmarkModelObserver { 69 class FaviconChangeObserver : public BookmarkModelObserver {
(...skipping 11 matching lines...) Expand all
81 wait_for_load_ = true; 81 wait_for_load_ = true;
82 content::RunMessageLoop(); 82 content::RunMessageLoop();
83 ASSERT_TRUE(node_->is_favicon_loaded()); 83 ASSERT_TRUE(node_->is_favicon_loaded());
84 ASSERT_FALSE(model_->GetFavicon(node_).IsEmpty()); 84 ASSERT_FALSE(model_->GetFavicon(node_).IsEmpty());
85 } 85 }
86 void WaitForSetFavicon() { 86 void WaitForSetFavicon() {
87 wait_for_load_ = false; 87 wait_for_load_ = false;
88 content::RunMessageLoop(); 88 content::RunMessageLoop();
89 } 89 }
90 virtual void BookmarkModelLoaded(BookmarkModel* model, 90 virtual void BookmarkModelLoaded(BookmarkModel* model,
91 bool ids_reassigned) OVERRIDE {} 91 bool ids_reassigned) override {}
92 virtual void BookmarkNodeMoved(BookmarkModel* model, 92 virtual void BookmarkNodeMoved(BookmarkModel* model,
93 const BookmarkNode* old_parent, 93 const BookmarkNode* old_parent,
94 int old_index, 94 int old_index,
95 const BookmarkNode* new_parent, 95 const BookmarkNode* new_parent,
96 int new_index) OVERRIDE {} 96 int new_index) override {}
97 virtual void BookmarkNodeAdded(BookmarkModel* model, 97 virtual void BookmarkNodeAdded(BookmarkModel* model,
98 const BookmarkNode* parent, 98 const BookmarkNode* parent,
99 int index) OVERRIDE {} 99 int index) override {}
100 virtual void BookmarkNodeRemoved( 100 virtual void BookmarkNodeRemoved(
101 BookmarkModel* model, 101 BookmarkModel* model,
102 const BookmarkNode* parent, 102 const BookmarkNode* parent,
103 int old_index, 103 int old_index,
104 const BookmarkNode* node, 104 const BookmarkNode* node,
105 const std::set<GURL>& removed_urls) OVERRIDE {} 105 const std::set<GURL>& removed_urls) override {}
106 virtual void BookmarkAllUserNodesRemoved( 106 virtual void BookmarkAllUserNodesRemoved(
107 BookmarkModel* model, 107 BookmarkModel* model,
108 const std::set<GURL>& removed_urls) OVERRIDE {} 108 const std::set<GURL>& removed_urls) override {}
109 109
110 virtual void BookmarkNodeChanged(BookmarkModel* model, 110 virtual void BookmarkNodeChanged(BookmarkModel* model,
111 const BookmarkNode* node) OVERRIDE { 111 const BookmarkNode* node) override {
112 if (model == model_ && node == node_) 112 if (model == model_ && node == node_)
113 model->GetFavicon(node); 113 model->GetFavicon(node);
114 } 114 }
115 virtual void BookmarkNodeChildrenReordered( 115 virtual void BookmarkNodeChildrenReordered(
116 BookmarkModel* model, 116 BookmarkModel* model,
117 const BookmarkNode* node) OVERRIDE {} 117 const BookmarkNode* node) override {}
118 virtual void BookmarkNodeFaviconChanged( 118 virtual void BookmarkNodeFaviconChanged(
119 BookmarkModel* model, 119 BookmarkModel* model,
120 const BookmarkNode* node) OVERRIDE { 120 const BookmarkNode* node) override {
121 if (model == model_ && node == node_) { 121 if (model == model_ && node == node_) {
122 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) 122 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded()))
123 base::MessageLoopForUI::current()->Quit(); 123 base::MessageLoopForUI::current()->Quit();
124 } 124 }
125 } 125 }
126 126
127 private: 127 private:
128 BookmarkModel* model_; 128 BookmarkModel* model_;
129 const BookmarkNode* node_; 129 const BookmarkNode* node_;
130 bool wait_for_load_; 130 bool wait_for_load_;
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 } 704 }
705 705
706 namespace { 706 namespace {
707 707
708 // Helper class used in the implementation of AwaitAllModelsMatch. 708 // Helper class used in the implementation of AwaitAllModelsMatch.
709 class AllModelsMatchChecker : public MultiClientStatusChangeChecker { 709 class AllModelsMatchChecker : public MultiClientStatusChangeChecker {
710 public: 710 public:
711 AllModelsMatchChecker(); 711 AllModelsMatchChecker();
712 virtual ~AllModelsMatchChecker(); 712 virtual ~AllModelsMatchChecker();
713 713
714 virtual bool IsExitConditionSatisfied() OVERRIDE; 714 virtual bool IsExitConditionSatisfied() override;
715 virtual std::string GetDebugMessage() const OVERRIDE; 715 virtual std::string GetDebugMessage() const override;
716 }; 716 };
717 717
718 AllModelsMatchChecker::AllModelsMatchChecker() 718 AllModelsMatchChecker::AllModelsMatchChecker()
719 : MultiClientStatusChangeChecker( 719 : MultiClientStatusChangeChecker(
720 sync_datatype_helper::test()->GetSyncServices()) {} 720 sync_datatype_helper::test()->GetSyncServices()) {}
721 721
722 AllModelsMatchChecker::~AllModelsMatchChecker() {} 722 AllModelsMatchChecker::~AllModelsMatchChecker() {}
723 723
724 bool AllModelsMatchChecker::IsExitConditionSatisfied() { 724 bool AllModelsMatchChecker::IsExitConditionSatisfied() {
725 return AllModelsMatch(); 725 return AllModelsMatch();
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 834
835 std::string IndexedSubfolderName(int i) { 835 std::string IndexedSubfolderName(int i) {
836 return base::StringPrintf("Subfolder Name %d", i); 836 return base::StringPrintf("Subfolder Name %d", i);
837 } 837 }
838 838
839 std::string IndexedSubsubfolderName(int i) { 839 std::string IndexedSubsubfolderName(int i) {
840 return base::StringPrintf("Subsubfolder Name %d", i); 840 return base::StringPrintf("Subsubfolder Name %d", i);
841 } 841 }
842 842
843 } // namespace bookmarks_helper 843 } // namespace bookmarks_helper
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/autofill_helper.cc ('k') | chrome/browser/sync/test/integration/dictionary_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698