Update from chromium https://crrev.com/302282

net/tools/flip_server/output_ordering.h

Index: net/tools/flip_server/output_ordering.h
diff --git a/net/tools/flip_server/output_ordering.h b/net/tools/flip_server/output_ordering.h
index 488d2e914a906099330687f0b3cb743ee5251411..82cbfd24c941a6c562f34ba5d194995250a21275 100644
--- a/net/tools/flip_server/output_ordering.h
+++ b/net/tools/flip_server/output_ordering.h
@@ -53,14 +53,14 @@ class OutputOrdering {
     BeginOutputtingAlarm(OutputOrdering* oo,
                          OutputOrdering::PriorityMapPointer* pmp,
                          const MemCacheIter& mci);
-    virtual ~BeginOutputtingAlarm();
+    ~BeginOutputtingAlarm() override;
 
     // EpollAlarmCallbackInterface:
-    virtual int64 OnAlarm() override;
-    virtual void OnRegistration(const EpollServer::AlarmRegToken& tok,
-                                EpollServer* eps) override;
-    virtual void OnUnregistration() override;
-    virtual void OnShutdown(EpollServer* eps) override;
+    int64 OnAlarm() override;
+    void OnRegistration(const EpollServer::AlarmRegToken& tok,
+                        EpollServer* eps) override;
+    void OnUnregistration() override;
+    void OnShutdown(EpollServer* eps) override;
 
    private:
     OutputOrdering* output_ordering_;