Index: base/observer_list_unittest.cc |
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc |
index 034581f871768fe410c1e33d783b351a5f7aaa53..5dc1e7ce1ca9c69cc884b3791cdb346bdd3e7a7c 100644 |
--- a/base/observer_list_unittest.cc |
+++ b/base/observer_list_unittest.cc |
@@ -27,7 +27,7 @@ class Foo { |
class Adder : public Foo { |
public: |
explicit Adder(int scaler) : total(0), scaler_(scaler) {} |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
total += x * scaler_; |
} |
virtual ~Adder() { } |
@@ -41,7 +41,7 @@ class Disrupter : public Foo { |
Disrupter(ObserverList<Foo>* list, Foo* doomed) |
: list_(list), doomed_(doomed) { } |
jar (doing other things)
2012/04/05 21:11:30
nit: one initializer per line.
Also the occaisona
|
virtual ~Disrupter() { } |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
list_->RemoveObserver(doomed_); |
} |
private: |
@@ -54,7 +54,7 @@ class ThreadSafeDisrupter : public Foo { |
ThreadSafeDisrupter(ObserverListThreadSafe<Foo>* list, Foo* doomed) |
: list_(list), doomed_(doomed) { } |
virtual ~ThreadSafeDisrupter() { } |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
list_->RemoveObserver(doomed_); |
} |
private: |
@@ -70,7 +70,7 @@ class AddInObserve : public Foo { |
observer_list(observer_list), |
adder(1) { |
} |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
if (!added) { |
added = true; |
observer_list->AddObserver(&adder); |
@@ -104,7 +104,7 @@ class AddRemoveThread : public PlatformThread::Delegate, |
virtual ~AddRemoveThread() { |
} |
- void ThreadMain() { |
+ virtual void ThreadMain() OVERRIDE { |
loop_ = new MessageLoop(); // Fire up a message loop. |
loop_->PostTask( |
FROM_HERE, |
@@ -145,7 +145,7 @@ class AddRemoveThread : public PlatformThread::Delegate, |
loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
} |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
count_observes_++; |
// If we're getting called after we removed ourselves from |
@@ -318,7 +318,7 @@ class FooRemover : public Foo { |
foos_.push_back(foo); |
} |
- virtual void Observe(int x) { |
+ virtual void Observe(int x) OVERRIDE { |
std::vector<Foo*> tmp; |
tmp.swap(foos_); |
for (std::vector<Foo*>::iterator it = tmp.begin(); |
@@ -470,7 +470,7 @@ class AddInClearObserve : public Foo { |
explicit AddInClearObserve(ObserverList<Foo>* list) |
: list_(list), added_(false), adder_(1) {} |
- virtual void Observe(int /* x */) { |
+ virtual void Observe(int /* x */) OVERRIDE { |
list_->Clear(); |
list_->AddObserver(&adder_); |
added_ = true; |
@@ -513,10 +513,11 @@ TEST(ObserverListTest, ClearNotifyExistingOnly) { |
class ListDestructor : public Foo { |
public: |
explicit ListDestructor(ObserverList<Foo>* list) : list_(list) {} |
- virtual void Observe(int x) { |
+ virtual ~ListDestructor() {} |
+ |
+ virtual void Observe(int x) OVERRIDE { |
delete list_; |
} |
- virtual ~ListDestructor() { } |
int total; |
private: |
ObserverList<Foo>* list_; |