Remove deprecated PeerConnectionObserver::OnStateChange and OnIceComplete

talk/app/webrtc/peerconnectioninterface_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 425 matching lines @@
       default:
         ADD_FAILURE();
         break;
     }
   }
 
   MediaStreamInterface* RemoteStream(const std::string& label) {
     return remote_streams_->find(label);
   }
   StreamCollectionInterface* remote_streams() const { return remote_streams_; }
-  virtual void OnAddStream(MediaStreamInterface* stream) {
+  void OnAddStream(MediaStreamInterface* stream) override {
     last_added_stream_ = stream;
     remote_streams_->AddStream(stream);
   }
-  virtual void OnRemoveStream(MediaStreamInterface* stream) {
+  void OnRemoveStream(MediaStreamInterface* stream) override {
     last_removed_stream_ = stream;
     remote_streams_->RemoveStream(stream);
   }
-  virtual void OnRenegotiationNeeded() {
-    renegotiation_needed_ = true;
-  }
-  virtual void OnDataChannel(DataChannelInterface* data_channel) {
+  void OnRenegotiationNeeded() override { renegotiation_needed_ = true; }
+  void OnDataChannel(DataChannelInterface* data_channel) override {
     last_datachannel_ = data_channel;
   }
 
-  virtual void OnIceConnectionChange(
-      PeerConnectionInterface::IceConnectionState new_state) {
+  void OnIceConnectionChange(
+      PeerConnectionInterface::IceConnectionState new_state) override {
     EXPECT_EQ(pc_->ice_connection_state(), new_state);
   }
-  virtual void OnIceGatheringChange(
-      PeerConnectionInterface::IceGatheringState new_state) {
+  void OnIceGatheringChange(
+      PeerConnectionInterface::IceGatheringState new_state) override {
     EXPECT_EQ(pc_->ice_gathering_state(), new_state);
+    ice_complete_ = new_state == PeerConnectionInterface::kIceGatheringComplete;
   }
-  virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {
+  void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override {
     EXPECT_NE(PeerConnectionInterface::kIceGatheringNew,
               pc_->ice_gathering_state());
 
     std::string sdp;
     EXPECT_TRUE(candidate->ToString(&sdp));
     EXPECT_LT(0u, sdp.size());
     last_candidate_.reset(webrtc::CreateIceCandidate(candidate->sdp_mid(),
         candidate->sdp_mline_index(), sdp, NULL));
     EXPECT_TRUE(last_candidate_.get() != NULL);
   }
-  // TODO(bemasc): Remove this once callers transition to OnSignalingChange.
-  virtual void OnIceComplete() {
-    ice_complete_ = true;
-    // OnIceGatheringChange(IceGatheringCompleted) and OnIceComplete() should
-    // be called approximately simultaneously.  For ease of testing, this
-    // check additionally requires that they be called in the above order.
-    EXPECT_EQ(PeerConnectionInterface::kIceGatheringComplete,
-      pc_->ice_gathering_state());
-  }
 
   // Returns the label of the last added stream.
   // Empty string if no stream have been added.
   std::string GetLastAddedStreamLabel() {
     if (last_added_stream_.get())
       return last_added_stream_->label();
     return "";
   }
   std::string GetLastRemovedStreamLabel() {
     if (last_removed_stream_.get())
@@ skipping 2017 matching lines @@
   FakeConstraints updated_answer_c;
   answer_c.SetMandatoryReceiveAudio(false);
   answer_c.SetMandatoryReceiveVideo(false);
 
   cricket::MediaSessionOptions updated_answer_options;
   EXPECT_TRUE(
       ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
   EXPECT_TRUE(updated_answer_options.has_audio());
   EXPECT_TRUE(updated_answer_options.has_video());
 }