| Index: ui/views/test/event_generator_delegate_mac.mm
|
| diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
|
| index db9b627313cdc6d0cdba47af66c9fa0dfd295ef9..c5b0b71a7dd53e861355f1e63b949a748a75b82e 100644
|
| --- a/ui/views/test/event_generator_delegate_mac.mm
|
| +++ b/ui/views/test/event_generator_delegate_mac.mm
|
| @@ -312,7 +312,7 @@ EventGeneratorDelegateMac::~EventGeneratorDelegateMac() {
|
| scoped_ptr<ui::EventTargetIterator>
|
| EventGeneratorDelegateMac::GetChildIterator() const {
|
| // Return NULL to dispatch all events to the result of GetRootTarget().
|
| - return scoped_ptr<ui::EventTargetIterator>();
|
| + return nullptr;
|
| }
|
|
|
| void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
|
|
|