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

net/tools/flip_server/http_interface.h

Index: net/tools/flip_server/http_interface.h
diff --git a/net/tools/flip_server/http_interface.h b/net/tools/flip_server/http_interface.h
index 08a595e3a81f5023134b6c4195b2a6b555d7a6cc..c6dc978b0867d5373bce0d538c7ee9e81da76354 100644
--- a/net/tools/flip_server/http_interface.h
+++ b/net/tools/flip_server/http_interface.h
@@ -28,86 +28,83 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface {
          SMInterface* sm_spdy_interface,
          MemoryCache* memory_cache,
          FlipAcceptor* acceptor);
-  virtual ~HttpSM();
+  ~HttpSM() override;
 
  private:
   // BalsaVisitorInterface:
-  virtual void ProcessBodyInput(const char* input, size_t size) override {}
-  virtual void ProcessBodyData(const char* input, size_t size) override;
-  virtual void ProcessHeaderInput(const char* input, size_t size) override {}
-  virtual void ProcessTrailerInput(const char* input, size_t size) override {}
-  virtual void ProcessHeaders(const BalsaHeaders& headers) override;
-  virtual void ProcessRequestFirstLine(const char* line_input,
-                                       size_t line_length,
-                                       const char* method_input,
-                                       size_t method_length,
-                                       const char* request_uri_input,
-                                       size_t request_uri_length,
-                                       const char* version_input,
-                                       size_t version_length) override {}
-  virtual void ProcessResponseFirstLine(const char* line_input,
-                                        size_t line_length,
-                                        const char* version_input,
-                                        size_t version_length,
-                                        const char* status_input,
-                                        size_t status_length,
-                                        const char* reason_input,
-                                        size_t reason_length) override {}
-  virtual void ProcessChunkLength(size_t chunk_length) override {}
-  virtual void ProcessChunkExtensions(const char* input, size_t size) override {
-  }
-  virtual void HeaderDone() override {}
-  virtual void MessageDone() override;
-  virtual void HandleHeaderError(BalsaFrame* framer) override;
-  virtual void HandleHeaderWarning(BalsaFrame* framer) override {}
-  virtual void HandleChunkingError(BalsaFrame* framer) override;
-  virtual void HandleBodyError(BalsaFrame* framer) override;
+  void ProcessBodyInput(const char* input, size_t size) override {}
+  void ProcessBodyData(const char* input, size_t size) override;
+  void ProcessHeaderInput(const char* input, size_t size) override {}
+  void ProcessTrailerInput(const char* input, size_t size) override {}
+  void ProcessHeaders(const BalsaHeaders& headers) override;
+  void ProcessRequestFirstLine(const char* line_input,
+                               size_t line_length,
+                               const char* method_input,
+                               size_t method_length,
+                               const char* request_uri_input,
+                               size_t request_uri_length,
+                               const char* version_input,
+                               size_t version_length) override {}
+  void ProcessResponseFirstLine(const char* line_input,
+                                size_t line_length,
+                                const char* version_input,
+                                size_t version_length,
+                                const char* status_input,
+                                size_t status_length,
+                                const char* reason_input,
+                                size_t reason_length) override {}
+  void ProcessChunkLength(size_t chunk_length) override {}
+  void ProcessChunkExtensions(const char* input, size_t size) override {}
+  void HeaderDone() override {}
+  void MessageDone() override;
+  void HandleHeaderError(BalsaFrame* framer) override;
+  void HandleHeaderWarning(BalsaFrame* framer) override {}
+  void HandleChunkingError(BalsaFrame* framer) override;
+  void HandleBodyError(BalsaFrame* framer) override;
 
   void HandleError();
 
  public:
   void AddToOutputOrder(const MemCacheIter& mci);
   BalsaFrame* spdy_framer() { return http_framer_; }
-  virtual void set_is_request() override {}
+  void set_is_request() override {}
   const OutputOrdering& output_ordering() const { return output_ordering_; }
 
   // SMInterface:
-  virtual void InitSMInterface(SMInterface* sm_spdy_interface,
-                               int32 server_idx) override;
-  virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool,
-                                SMInterface* sm_interface,
-                                EpollServer* epoll_server,
-                                int fd,
-                                std::string server_ip,
-                                std::string server_port,
-                                std::string remote_ip,
-                                bool use_ssl) override;
-  virtual size_t ProcessReadInput(const char* data, size_t len) override;
-  virtual size_t ProcessWriteInput(const char* data, size_t len) override;
-  virtual bool MessageFullyRead() const override;
-  virtual void SetStreamID(uint32 stream_id) override;
-  virtual bool Error() const override;
-  virtual const char* ErrorAsString() const override;
-  virtual void Reset() override;
-  virtual void ResetForNewInterface(int32 server_idx) override {}
-  virtual void ResetForNewConnection() override;
-  virtual void Cleanup() override;
-  virtual int PostAcceptHook() override;
-
-  virtual void NewStream(uint32 stream_id,
-                         uint32 priority,
-                         const std::string& filename) override;
-  virtual void SendEOF(uint32 stream_id) override;
-  virtual void SendErrorNotFound(uint32 stream_id) override;
-  virtual size_t SendSynStream(uint32 stream_id,
-                               const BalsaHeaders& headers) override;
-  virtual size_t SendSynReply(uint32 stream_id,
-                              const BalsaHeaders& headers) override;
-  virtual void SendDataFrame(uint32 stream_id,
-                             const char* data,
-                             int64 len,
-                             uint32 flags,
-                             bool compress) override;
+  void InitSMInterface(SMInterface* sm_spdy_interface,
+                       int32 server_idx) override;
+  void InitSMConnection(SMConnectionPoolInterface* connection_pool,
+                        SMInterface* sm_interface,
+                        EpollServer* epoll_server,
+                        int fd,
+                        std::string server_ip,
+                        std::string server_port,
+                        std::string remote_ip,
+                        bool use_ssl) override;
+  size_t ProcessReadInput(const char* data, size_t len) override;
+  size_t ProcessWriteInput(const char* data, size_t len) override;
+  bool MessageFullyRead() const override;
+  void SetStreamID(uint32 stream_id) override;
+  bool Error() const override;
+  const char* ErrorAsString() const override;
+  void Reset() override;
+  void ResetForNewInterface(int32 server_idx) override {}
+  void ResetForNewConnection() override;
+  void Cleanup() override;
+  int PostAcceptHook() override;
+
+  void NewStream(uint32 stream_id,
+                 uint32 priority,
+                 const std::string& filename) override;
+  void SendEOF(uint32 stream_id) override;
+  void SendErrorNotFound(uint32 stream_id) override;
+  size_t SendSynStream(uint32 stream_id, const BalsaHeaders& headers) override;
+  size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers) override;
+  void SendDataFrame(uint32 stream_id,
+                     const char* data,
+                     int64 len,
+                     uint32 flags,
+                     bool compress) override;
 
  private:
   void SendEOFImpl(uint32 stream_id);
@@ -121,7 +118,7 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface {
                          uint32 flags,
                          bool compress);
   void EnqueueDataFrame(DataFrame* df);
-  virtual void GetOutput() override;
+  void GetOutput() override;
 
  private:
   BalsaFrame* http_framer_;