| Index: chrome/browser/rlz/rlz_unittest.cc
|
| diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc
|
| index 23e1dc17b38b33eec1aa548a99d794bdd7dc2d44..6a2f26ec762bd11c8a0a583cff2bb7e157028901 100644
|
| --- a/chrome/browser/rlz/rlz_unittest.cc
|
| +++ b/chrome/browser/rlz/rlz_unittest.cc
|
| @@ -106,40 +106,40 @@ class TestRLZTracker : public RLZTracker {
|
| }
|
|
|
| private:
|
| - virtual void ScheduleDelayedInit(base::TimeDelta delay) OVERRIDE {
|
| + virtual 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 {
|
| + virtual void ScheduleFinancialPing() override {
|
| PingNowImpl();
|
| }
|
|
|
| virtual bool ScheduleRecordProductEvent(rlz_lib::Product product,
|
| rlz_lib::AccessPoint point,
|
| - rlz_lib::Event event_id) OVERRIDE {
|
| + rlz_lib::Event event_id) override {
|
| return !assume_not_ui_thread_;
|
| }
|
|
|
| - virtual bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) OVERRIDE {
|
| + virtual bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) override {
|
| return !assume_not_ui_thread_;
|
| }
|
|
|
| - virtual bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) OVERRIDE {
|
| + virtual bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) override {
|
| return !assume_not_ui_thread_;
|
| }
|
|
|
| #if defined(OS_CHROMEOS)
|
| - virtual bool ScheduleClearRlzState() OVERRIDE {
|
| + virtual bool ScheduleClearRlzState() override {
|
| return !assume_not_ui_thread_;
|
| }
|
| #endif
|
|
|
| virtual bool SendFinancialPing(const std::string& brand,
|
| const base::string16& lang,
|
| - const base::string16& referral) OVERRIDE {
|
| + const base::string16& referral) override {
|
| // Don't ping the server during tests, just pretend as if we did.
|
| EXPECT_FALSE(brand.empty());
|
| pinged_brands_.insert(brand);
|
| @@ -163,7 +163,7 @@ class TestRLZTracker : public RLZTracker {
|
|
|
| class RlzLibTest : public RlzLibTestNoMachineState {
|
| protected:
|
| - virtual void SetUp() OVERRIDE;
|
| + virtual void SetUp() override;
|
|
|
| void SetMainBrand(const char* brand);
|
| void SetReactivationBrand(const char* brand);
|
|
|