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

Unified Diff: chrome/browser/rlz/rlz_unittest.cc

Issue 848963002: Fix official Mac build for strict virtual annotations check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/rlz/rlz_unittest.cc
diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc
index 137c34fddba4aaa9d5de5ad9eddab4acc9cd88d2..83c422a7ab38014919dce594ff4f6524fe1d07cb 100644
--- a/chrome/browser/rlz/rlz_unittest.cc
+++ b/chrome/browser/rlz/rlz_unittest.cc
@@ -93,7 +93,7 @@ class TestRLZTracker : public RLZTracker {
set_tracker(this);
}
- virtual ~TestRLZTracker() {
+ ~TestRLZTracker() override {
set_tracker(NULL);
}
@@ -106,28 +106,28 @@ class TestRLZTracker : public RLZTracker {
}
private:
- virtual void ScheduleDelayedInit(base::TimeDelta delay) override {
+ void ScheduleDelayedInit(base::TimeDelta delay) override {
// If the delay is 0, invoke the delayed init now. Otherwise,
// don't schedule anything, it will be manually called during tests.
if (delay == base::TimeDelta())
DelayedInit();
}
- virtual void ScheduleFinancialPing() override {
+ void ScheduleFinancialPing() override {
PingNowImpl();
}
- virtual bool ScheduleRecordProductEvent(rlz_lib::Product product,
+ bool ScheduleRecordProductEvent(rlz_lib::Product product,
rlz_lib::AccessPoint point,
rlz_lib::Event event_id) override {
return !assume_not_ui_thread_;
}
- virtual bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) override {
+ bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) override {
return !assume_not_ui_thread_;
}
- virtual bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) override {
+ bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) override {
return !assume_not_ui_thread_;
}
@@ -137,7 +137,7 @@ class TestRLZTracker : public RLZTracker {
}
#endif
- virtual bool SendFinancialPing(const std::string& brand,
+ bool SendFinancialPing(const std::string& brand,
const base::string16& lang,
const base::string16& referral) override {
// Don't ping the server during tests, just pretend as if we did.
@@ -163,7 +163,7 @@ class TestRLZTracker : public RLZTracker {
class RlzLibTest : public RlzLibTestNoMachineState {
protected:
- virtual void SetUp() override;
+ void SetUp() override;
void SetMainBrand(const char* brand);
void SetReactivationBrand(const char* brand);

Powered by Google App Engine
This is Rietveld 408576698