@@ -731,8 +731,11 @@ TEST_F(InspectorSocketTest, GetThenHandshake) {
|
731 | 731 | manual_inspector_socket_cleanup(); |
732 | 732 | } |
733 | 733 | |
734 | | -static void WriteBeforeHandshake_close_cb(uv_handle_t* handle) { |
735 | | - *(static_cast<bool *>(handle->data)) = true; |
| 734 | +static void WriteBeforeHandshake_inspector_delegate(inspector_handshake_event e, |
| 735 | +const std::string& path, |
| 736 | +bool* cont) { |
| 737 | +if (e == kInspectorHandshakeFailed) |
| 738 | + inspector_closed = 1; |
736 | 739 | } |
737 | 740 | |
738 | 741 | TEST_F(InspectorSocketTest, WriteBeforeHandshake) { |
@@ -743,11 +746,10 @@ TEST_F(InspectorSocketTest, WriteBeforeHandshake) {
|
743 | 746 | inspector_write(&inspector, MESSAGE1, sizeof(MESSAGE1) - 1); |
744 | 747 | inspector_write(&inspector, MESSAGE2, sizeof(MESSAGE2) - 1); |
745 | 748 | expect_on_client(EXPECTED, sizeof(EXPECTED) - 1); |
746 | | -bool flag = false; |
747 | | - client_socket.data = &flag; |
748 | | -uv_close(reinterpret_cast<uv_handle_t*>(&client_socket), |
749 | | - WriteBeforeHandshake_close_cb); |
750 | | -SPIN_WHILE(!flag); |
| 749 | + inspector_closed = 0; |
| 750 | + handshake_delegate = WriteBeforeHandshake_inspector_delegate; |
| 751 | +really_close(reinterpret_cast<uv_handle_t*>(&client_socket)); |
| 752 | +SPIN_WHILE(inspector_closed == 0); |
751 | 753 | } |
752 | 754 | |
753 | 755 | static void CleanupSocketAfterEOF_close_cb(inspector_socket_t* inspector, |
|