| Index: net/tools/flip_server/flip_test_utils.h | 
| diff --git a/net/tools/flip_server/flip_test_utils.h b/net/tools/flip_server/flip_test_utils.h | 
| index 8a10b9563d1dccebecf5da4faed5ce1264020488..0a61a60f771b36e7b86662e1d5a391fb7ada800c 100644 | 
| --- a/net/tools/flip_server/flip_test_utils.h | 
| +++ b/net/tools/flip_server/flip_test_utils.h | 
| @@ -19,14 +19,15 @@ class MockSMInterface : public SMInterface { | 
| virtual ~MockSMInterface(); | 
|  | 
| MOCK_METHOD2(InitSMInterface, void(SMInterface*, int32)); | 
| -  MOCK_METHOD8(InitSMConnection, void(SMConnectionPoolInterface*, | 
| -                                      SMInterface*, | 
| -                                      EpollServer*, | 
| -                                      int, | 
| -                                      std::string, | 
| -                                      std::string, | 
| -                                      std::string, | 
| -                                      bool)); | 
| +  MOCK_METHOD8(InitSMConnection, | 
| +               void(SMConnectionPoolInterface*, | 
| +                    SMInterface*, | 
| +                    EpollServer*, | 
| +                    int, | 
| +                    std::string, | 
| +                    std::string, | 
| +                    std::string, | 
| +                    bool)); | 
| MOCK_METHOD2(ProcessReadInput, size_t(const char*, size_t)); | 
| MOCK_METHOD2(ProcessWriteInput, size_t(const char*, size_t)); | 
| MOCK_METHOD1(SetStreamID, void(uint32 stream_id)); | 
|  |