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

net/tools/flip_server/spdy_interface.h

Index: net/tools/flip_server/spdy_interface.h
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index 2d2437aecc166d9edfc584ffe9652ced2cd2fcb4..de53e878a0d5860699b8879f34c35005865ad1ea 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -32,25 +32,25 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface {
          MemoryCache* memory_cache,
          FlipAcceptor* acceptor,
          SpdyMajorVersion spdy_version);
-  virtual ~SpdySM();
+  ~SpdySM() override;
 
-  virtual void InitSMInterface(SMInterface* sm_http_interface,
-                               int32 server_idx) override {}
+  void InitSMInterface(SMInterface* sm_http_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;
+  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;
 
   // Create new SPDY framer after reusing SpdySM and negotiating new version
   void CreateFramer(SpdyMajorVersion spdy_version);
 
  private:
-  virtual void set_is_request() override {}
+  void set_is_request() override {}
   SMInterface* NewConnectionInterface();
   // virtual for tests
   virtual SMInterface* FindOrMakeNewSMConnectionInterface(
@@ -63,31 +63,31 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface {
                           bool* is_https_scheme);
 
   // BufferedSpdyFramerVisitorInterface:
-  virtual void OnError(SpdyFramer::SpdyError error_code) override {}
-  virtual void OnStreamError(SpdyStreamId stream_id,
-                             const std::string& description) override {}
+  void OnError(SpdyFramer::SpdyError error_code) override {}
+  void OnStreamError(SpdyStreamId stream_id,
+                     const std::string& description) override {}
   // Called after all the header data for SYN_STREAM control frame is received.
-  virtual void OnSynStream(SpdyStreamId stream_id,
-                           SpdyStreamId associated_stream_id,
-                           SpdyPriority priority,
-                           bool fin,
-                           bool unidirectional,
-                           const SpdyHeaderBlock& headers) override;
+  void OnSynStream(SpdyStreamId stream_id,
+                   SpdyStreamId associated_stream_id,
+                   SpdyPriority priority,
+                   bool fin,
+                   bool unidirectional,
+                   const SpdyHeaderBlock& headers) override;
 
   // Called after all the header data for SYN_REPLY control frame is received.
-  virtual void OnSynReply(SpdyStreamId stream_id,
-                          bool fin,
-                          const SpdyHeaderBlock& headers) override;
+  void OnSynReply(SpdyStreamId stream_id,
+                  bool fin,
+                  const SpdyHeaderBlock& headers) override;
 
   // Called after all the header data for HEADERS control frame is received.
-  virtual void OnHeaders(SpdyStreamId stream_id,
-                         bool fin,
-                         const SpdyHeaderBlock& headers) override;
+  void OnHeaders(SpdyStreamId stream_id,
+                 bool fin,
+                 const SpdyHeaderBlock& headers) override;
 
   // Called when data frame header is received.
-  virtual void OnDataFrameHeader(SpdyStreamId stream_id,
-                                 size_t length,
-                                 bool fin) override {}
+  void OnDataFrameHeader(SpdyStreamId stream_id,
+                         size_t length,
+                         bool fin) override {}
 
   // Called when data is received.
   // |stream_id| The stream receiving data.
@@ -95,76 +95,71 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface {
   // |len| The length of the data buffer.
   // When the other side has finished sending data on this stream,
   // this method will be called with a zero-length buffer.
-  virtual void OnStreamFrameData(SpdyStreamId stream_id,
-                                 const char* data,
-                                 size_t len,
-                                 bool fin) override;
+  void OnStreamFrameData(SpdyStreamId stream_id,
+                         const char* data,
+                         size_t len,
+                         bool fin) override;
 
   // Called when a SETTINGS frame is received.
   // |clear_persisted| True if the respective flag is set on the SETTINGS frame.
-  virtual void OnSettings(bool clear_persisted) override {}
+  void OnSettings(bool clear_persisted) override {}
 
   // Called when an individual setting within a SETTINGS frame has been parsed
   // and validated.
-  virtual void OnSetting(SpdySettingsIds id,
-                         uint8 flags,
-                         uint32 value) override {}
+  void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) override {}
 
   // Called when a PING frame has been parsed.
-  virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {}
+  void OnPing(SpdyPingId unique_id, bool is_ack) override {}
 
   // Called when a RST_STREAM frame has been parsed.
-  virtual void OnRstStream(SpdyStreamId stream_id,
-                           SpdyRstStreamStatus status) override;
+  void OnRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) override;
 
   // Called when a GOAWAY frame has been parsed.
-  virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
-                        SpdyGoAwayStatus status) override {}
+  void OnGoAway(SpdyStreamId last_accepted_stream_id,
+                SpdyGoAwayStatus status) override {}
 
   // Called when a WINDOW_UPDATE frame has been parsed.
-  virtual void OnWindowUpdate(SpdyStreamId stream_id,
-                              uint32 delta_window_size) override {}
+  void OnWindowUpdate(SpdyStreamId stream_id,
+                      uint32 delta_window_size) override {}
 
   // Called when a PUSH_PROMISE frame has been parsed.
-  virtual void OnPushPromise(SpdyStreamId stream_id,
-                             SpdyStreamId promised_stream_id,
-                             const SpdyHeaderBlock& headers) override {}
+  void OnPushPromise(SpdyStreamId stream_id,
+                     SpdyStreamId promised_stream_id,
+                     const SpdyHeaderBlock& headers) override {}
 
-  virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override;
+  bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override;
 
  public:
-  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;
+  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;
   // SMInterface's Cleanup is currently only called by SMConnection after a
   // protocol message as been fully read. Spdy's SMInterface does not need
   // to do any cleanup at this time.
   // TODO(klindsay) This method is probably not being used properly and
   // some logic review and method renaming is probably in order.
-  virtual void Cleanup() override {}
+  void Cleanup() override {}
   // Send a settings frame
-  virtual int PostAcceptHook() override;
-  virtual void NewStream(uint32 stream_id,
-                         uint32 priority,
-                         const std::string& filename) override;
+  int PostAcceptHook() override;
+  void NewStream(uint32 stream_id,
+                 uint32 priority,
+                 const std::string& filename) override;
   void AddToOutputOrder(const MemCacheIter& mci);
-  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 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;
   BufferedSpdyFramer* spdy_framer() { return buffered_spdy_framer_.get(); }
 
   const OutputOrdering& output_ordering() const {
@@ -193,7 +188,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface {
                          SpdyDataFlags flags,
                          bool compress);
   void EnqueueDataFrame(DataFrame* df);
-  virtual void GetOutput() override;
+  void GetOutput() override;
 
  private:
   scoped_ptr<BufferedSpdyFramer> buffered_spdy_framer_;