base/observer_list_unittest.cc - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/observer_list_unittest.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

Index: base/observer_list_unittest.cc

diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc

index 636aa83fb9dcc22f9b1b1360d7609e6dfcd7c513..ea916b1a9c4c53244aad92a88e7c089dbcd5a20a 100644

--- a/base/observer_list_unittest.cc

+++ b/base/observer_list_unittest.cc

@@ -71,7 +71,7 @@ class AddInObserve : public Foo {

adder(1) {

}

- virtual void Observe(int x) override {

+ void Observe(int x) override {

if (!added) {

added = true;

observer_list->AddObserver(&adder);

@@ -94,7 +94,7 @@ class AddRemoveThread : public PlatformThread::Delegate,

public:

AddRemoveThread(ObserverListThreadSafe<Foo>* list, bool notify)

: list_(list),

- loop_(NULL),

+ loop_(nullptr),

in_list_(false),

start_(Time::Now()),

count_observes_(0),