| Index: chrome/browser/history/history_unittest.cc
|
| diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
|
| index dc58c8a9b2c87247ac966c506c1e8454b3eefe04..99adfeda2e650ff2fb505c85449e2b8fe1dfc5a6 100644
|
| --- a/chrome/browser/history/history_unittest.cc
|
| +++ b/chrome/browser/history/history_unittest.cc
|
| @@ -93,19 +93,17 @@ class BackendDelegate : public HistoryBackend::Delegate {
|
| : history_test_(history_test) {
|
| }
|
|
|
| - virtual void NotifyProfileError(sql::InitStatus init_status) override {}
|
| - virtual void SetInMemoryBackend(
|
| - scoped_ptr<InMemoryHistoryBackend> backend) override;
|
| - virtual void NotifyAddVisit(const BriefVisitInfo& info) override {}
|
| - virtual void NotifyFaviconChanged(const std::set<GURL>& url) override {}
|
| - virtual void NotifyURLVisited(ui::PageTransition transition,
|
| - const URLRow& row,
|
| - const RedirectList& redirects,
|
| - base::Time visit_time) override {}
|
| - virtual void BroadcastNotifications(
|
| - int type,
|
| - scoped_ptr<HistoryDetails> details) override;
|
| - virtual void DBLoaded() override {}
|
| + void NotifyProfileError(sql::InitStatus init_status) override {}
|
| + void SetInMemoryBackend(scoped_ptr<InMemoryHistoryBackend> backend) override;
|
| + void NotifyAddVisit(const BriefVisitInfo& info) override {}
|
| + void NotifyFaviconChanged(const std::set<GURL>& url) override {}
|
| + void NotifyURLVisited(ui::PageTransition transition,
|
| + const URLRow& row,
|
| + const RedirectList& redirects,
|
| + base::Time visit_time) override {}
|
| + void BroadcastNotifications(int type,
|
| + scoped_ptr<HistoryDetails> details) override;
|
| + void DBLoaded() override {}
|
|
|
| private:
|
| HistoryBackendDBTest* history_test_;
|
| @@ -1507,12 +1505,11 @@ class HistoryDBTaskImpl : public HistoryDBTask {
|
| HistoryDBTaskImpl(int* invoke_count, bool* done_invoked)
|
| : invoke_count_(invoke_count), done_invoked_(done_invoked) {}
|
|
|
| - virtual bool RunOnDBThread(HistoryBackend* backend,
|
| - HistoryDatabase* db) override {
|
| + bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) override {
|
| return (++*invoke_count_ == kWantInvokeCount);
|
| }
|
|
|
| - virtual void DoneRunOnMainThread() override {
|
| + void DoneRunOnMainThread() override {
|
| *done_invoked_ = true;
|
| base::MessageLoop::current()->Quit();
|
| }
|
| @@ -1521,7 +1518,7 @@ class HistoryDBTaskImpl : public HistoryDBTask {
|
| bool* done_invoked_;
|
|
|
| private:
|
| - virtual ~HistoryDBTaskImpl() {}
|
| + ~HistoryDBTaskImpl() override {}
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HistoryDBTaskImpl);
|
| };
|
|
|