1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/ui/events/event_dispatcher_unittest.cc b/chromium/ui/events/event_dispatcher_unittest.cc
index 6b67cb30e5c..37dc1cc3f7f 100644
--- a/chromium/ui/events/event_dispatcher_unittest.cc
+++ b/chromium/ui/events/event_dispatcher_unittest.cc
@@ -21,9 +21,7 @@ namespace {
 class TestTarget : public EventTarget,
                    public EventHandler {
  public:
-  TestTarget() : parent_(NULL), valid_(true) {
-    SetTargetHandler(this);
-  }
+  TestTarget() : parent_(nullptr), valid_(true) { SetTargetHandler(this); }
   ~TestTarget() override {}
 
   void set_parent(TestTarget* parent) { parent_ = parent; }
@@ -52,7 +50,7 @@ class TestTarget : public EventTarget,
     return nullptr;
   }
 
-  EventTargeter* GetEventTargeter() override { return NULL; }
+  EventTargeter* GetEventTargeter() override { return nullptr; }
 
   TestTarget* parent_;
   std::vector<int> handler_list_;
@@ -163,8 +161,7 @@ class EventHandlerDestroyer : public TestEventHandler {
   EventHandlerDestroyer(int id, EventHandler* destroy)
       : TestEventHandler(id),
         to_destroy_(destroy),
-        dispatcher_delegate_(NULL) {
-  }
+        dispatcher_delegate_(nullptr) {}
 
   ~EventHandlerDestroyer() override { CHECK(!to_destroy_); }
 
@@ -176,11 +173,11 @@ class EventHandlerDestroyer : public TestEventHandler {
   void ReceivedEvent(Event* event) override {
     TestEventHandler::ReceivedEvent(event);
     delete to_destroy_;
-    to_destroy_ = NULL;
+    to_destroy_ = nullptr;
 
     if (dispatcher_delegate_) {
       delete dispatcher_delegate_;
-      dispatcher_delegate_ = NULL;
+      dispatcher_delegate_ = nullptr;
     }
   }