Remove deprecated PeerConnectionObserver::OnStateChange and OnIceComplete

talk/app/webrtc/webrtcsession_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 161 matching lines @@
 enum RTCCertificateGenerationMethod { ALREADY_GENERATED, DTLS_IDENTITY_STORE };
 
 class MockIceObserver : public webrtc::IceObserver {
  public:
   MockIceObserver()
       : oncandidatesready_(false),
         ice_connection_state_(PeerConnectionInterface::kIceConnectionNew),
         ice_gathering_state_(PeerConnectionInterface::kIceGatheringNew) {
   }
 
-  virtual void OnIceConnectionChange(
-      PeerConnectionInterface::IceConnectionState new_state) {
+  void OnIceConnectionChange(
+      PeerConnectionInterface::IceConnectionState new_state) override {
     ice_connection_state_ = new_state;
   }
-  virtual void OnIceGatheringChange(
-      PeerConnectionInterface::IceGatheringState new_state) {
+  void OnIceGatheringChange(
+      PeerConnectionInterface::IceGatheringState new_state) override {
     // We can never transition back to "new".
     EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, new_state);
     ice_gathering_state_ = new_state;
-
-    // oncandidatesready_ really means "ICE gathering is complete".
-    // This if statement ensures that this value remains correct when we
-    // transition from kIceGatheringComplete to kIceGatheringGathering.
-    if (new_state == PeerConnectionInterface::kIceGatheringGathering) {
-      oncandidatesready_ = false;
-    }
+    oncandidatesready_ =
+        new_state == PeerConnectionInterface::kIceGatheringComplete;
   }
 
   // Found a new candidate.
-  virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {
+  void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override {
     switch (candidate->sdp_mline_index()) {
       case kMediaContentIndex0:
         mline_0_candidates_.push_back(candidate->candidate());
         break;
       case kMediaContentIndex1:
         mline_1_candidates_.push_back(candidate->candidate());
         break;
       default:
         ASSERT(false);
     }
 
     // The ICE gathering state should always be Gathering when a candidate is
     // received (or possibly Completed in the case of the final candidate).
     EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, ice_gathering_state_);
   }
 
-  // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange.
-  virtual void OnIceComplete() {
-    EXPECT_FALSE(oncandidatesready_);
-    oncandidatesready_ = 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,
-              ice_gathering_state_);
-  }
-
   bool oncandidatesready_;
   std::vector<cricket::Candidate> mline_0_candidates_;
   std::vector<cricket::Candidate> mline_1_candidates_;
   PeerConnectionInterface::IceConnectionState ice_connection_state_;
   PeerConnectionInterface::IceGatheringState ice_gathering_state_;
 };
 
 class WebRtcSessionForTest : public webrtc::WebRtcSession {
  public:
   WebRtcSessionForTest(webrtc::MediaControllerInterface* media_controller,
@@ skipping 4070 matching lines @@
 }
 
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
                         WebRtcSessionTest,
                         testing::Values(ALREADY_GENERATED,
                                         DTLS_IDENTITY_STORE));