Return to old iceConnectionState implementation.

The new iceConnectionState had a few bugs late in beta. Instead of merging fixes in beta late we'll return to the old behavior for now.

Bug: chromium:936370
Change-Id: I6d1e78d8f86812800ddf74f24d4bb31687228a14
Reviewed-on: https://chromium-review.googlesource.com/c/1489200Reviewed-by: Henrik Boström <hbos@chromium.org>
Commit-Queue: Jonas Olsson <jonasolsson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635978}

content/renderer/media/webrtc/rtc_peer_connection_handler.cc

@@ -858,16 +858,16 @@ class RTCPeerConnectionHandler::Observer
       handler_->OnRenegotiationNeeded();
     }
   }
-
-  void OnIceConnectionChange(
-      PeerConnectionInterface::IceConnectionState new_state) override {}
   void OnStandardizedIceConnectionChange(
+      PeerConnectionInterface::IceConnectionState new_state) override {}
+  void OnIceConnectionChange(
       PeerConnectionInterface::IceConnectionState new_state) override {
     if (!main_thread_->BelongsToCurrentThread()) {
       main_thread_->PostTask(
-          FROM_HERE, base::BindOnce(&RTCPeerConnectionHandler::Observer::
-                                        OnStandardizedIceConnectionChange,
-                                    this, new_state));
+          FROM_HERE,
+          base::BindOnce(
+              &RTCPeerConnectionHandler::Observer::OnIceConnectionChange, this,
+              new_state));
     } else if (handler_) {
       handler_->OnIceConnectionChange(new_state);
     }

content/renderer/media/webrtc/rtc_peer_connection_handler_unittest.cc

@@ -1047,7 +1047,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionNew));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionChecking;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1057,7 +1057,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionChecking));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionConnected;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1067,7 +1067,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionConnected));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionCompleted;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1077,7 +1077,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionCompleted));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionFailed;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1087,7 +1087,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionFailed));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionDisconnected;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1097,7 +1097,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionDisconnected));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 
   new_state = webrtc::PeerConnectionInterface::kIceConnectionClosed;
   EXPECT_CALL(*mock_tracker_.get(),
@@ -1107,7 +1107,7 @@ TEST_F(RTCPeerConnectionHandlerTest, OnIceConnectionChange) {
   EXPECT_CALL(*mock_client_.get(),
               DidChangeIceConnectionState(
                   webrtc::PeerConnectionInterface::kIceConnectionClosed));
-  pc_handler_->observer()->OnStandardizedIceConnectionChange(new_state);
+  pc_handler_->observer()->OnIceConnectionChange(new_state);
 }
 
 TEST_F(RTCPeerConnectionHandlerTest, OnIceGatheringChange) {