| Index: chrome/browser/history/history_unittest.cc
|
| diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
|
| index a4fdf6be97ccd5064d4f38877352f51092c275c4..bad10f10eeafa25ea62a4339d5bbd260adf42891 100644
|
| --- a/chrome/browser/history/history_unittest.cc
|
| +++ b/chrome/browser/history/history_unittest.cc
|
| @@ -93,16 +93,16 @@ class BackendDelegate : public HistoryBackend::Delegate {
|
| : history_test_(history_test) {
|
| }
|
|
|
| - virtual void NotifyProfileError(sql::InitStatus init_status) OVERRIDE {}
|
| + virtual void NotifyProfileError(sql::InitStatus init_status) override {}
|
| virtual void SetInMemoryBackend(
|
| - scoped_ptr<InMemoryHistoryBackend> backend) OVERRIDE;
|
| - virtual void NotifyFaviconChanged(const std::set<GURL>& url) OVERRIDE {}
|
| + scoped_ptr<InMemoryHistoryBackend> backend) override;
|
| + virtual void NotifyFaviconChanged(const std::set<GURL>& url) override {}
|
| virtual void BroadcastNotifications(
|
| int type,
|
| - scoped_ptr<HistoryDetails> details) OVERRIDE;
|
| - virtual void DBLoaded() OVERRIDE {}
|
| + scoped_ptr<HistoryDetails> details) override;
|
| + virtual void DBLoaded() override {}
|
| virtual void NotifyVisitDBObserversOnAddVisit(
|
| - const BriefVisitInfo& info) OVERRIDE {}
|
| + const BriefVisitInfo& info) override {}
|
| private:
|
| HistoryBackendDBTest* history_test_;
|
| };
|
| @@ -1504,11 +1504,11 @@ class HistoryDBTaskImpl : public HistoryDBTask {
|
| : invoke_count_(invoke_count), done_invoked_(done_invoked) {}
|
|
|
| virtual bool RunOnDBThread(HistoryBackend* backend,
|
| - HistoryDatabase* db) OVERRIDE {
|
| + HistoryDatabase* db) override {
|
| return (++*invoke_count_ == kWantInvokeCount);
|
| }
|
|
|
| - virtual void DoneRunOnMainThread() OVERRIDE {
|
| + virtual void DoneRunOnMainThread() override {
|
| *done_invoked_ = true;
|
| base::MessageLoop::current()->Quit();
|
| }
|
|
|