Revert of Adding "first packet received" notification to PeerConnectionObserver.

talk/app/webrtc/peerconnection_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 233 matching lines @@
 
     std::string ice_sdp;
     EXPECT_TRUE(candidate->ToString(&ice_sdp));
     if (signaling_message_receiver_ == nullptr) {
       // Remote party may be deleted.
       return;
     }
     signaling_message_receiver_->ReceiveIceMessage(
         candidate->sdp_mid(), candidate->sdp_mline_index(), ice_sdp);
   }
-  void OnFirstMediaPacketReceived() override { received_media_packet_ = true; }
 
   // MediaStreamInterface callback
   void OnChanged() override {
     // Track added or removed from MediaStream, so update our renderers.
     rtc::scoped_refptr<StreamCollectionInterface> remote_streams =
         pc()->remote_streams();
     // Remove renderers for tracks that were removed.
     for (auto it = fake_video_renderers_.begin();
          it != fake_video_renderers_.end();) {
       if (remote_streams->FindVideoTrack(it->first) == nullptr) {
@@ skipping 115 matching lines @@
   bool can_receive_video() {
     bool value;
     if (webrtc::FindConstraint(&session_description_constraints_,
                                MediaConstraintsInterface::kOfferToReceiveVideo,
                                &value, nullptr)) {
       return value;
     }
     return true;
   }
 
-  bool received_media_packet() const { return received_media_packet_; }
-
   void OnIceComplete() override { LOG(INFO) << id_ << "OnIceComplete"; }
 
   void OnDataChannel(DataChannelInterface* data_channel) override {
     LOG(INFO) << id_ << "OnDataChannel";
     data_channel_ = data_channel;
     data_observer_.reset(new MockDataChannelObserver(data_channel));
   }
 
   void CreateDataChannel() {
     data_channel_ = pc()->CreateDataChannel(kDataChannelLabel, nullptr);
@@ skipping 518 matching lines @@
 
   webrtc::FakeConstraints session_description_constraints_;
   bool remove_msid_ = false;  // True if MSID should be removed in received SDP.
   bool remove_bundle_ =
       false;  // True if bundle should be removed in received SDP.
   bool remove_sdes_ =
       false;  // True if a=crypto should be removed in received SDP.
 
   rtc::scoped_refptr<DataChannelInterface> data_channel_;
   rtc::scoped_ptr<MockDataChannelObserver> data_observer_;
-
-  // "true" if the PeerConnection indicated that a packet was received,
-  // through PeerConnectionObserverInterface.
-  bool received_media_packet_ = false;
 };
 
 class P2PTestConductor : public testing::Test {
  public:
   P2PTestConductor()
       : pss_(new rtc::PhysicalSocketServer),
         ss_(new rtc::VirtualSocketServer(pss_.get())),
         ss_scope_(ss_.get()) {}
 
   bool SessionActive() {
@@ skipping 160 matching lines @@
     }
     if (receiving_client_->can_receive_audio() ||
         receiving_client_->can_receive_video()) {
       EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceGatheringComplete,
                      receiving_client_->ice_gathering_state(),
                      kMaxWaitForFramesMs);
     }
 
     EXPECT_TRUE_WAIT(FramesNotPending(audio_frame_count, video_frame_count),
                      kMaxWaitForFramesMs);
-    if (audio_frame_count != -1 || video_frame_count != -1) {
-      EXPECT_TRUE(initiating_client_->received_media_packet());
-      EXPECT_TRUE(receiving_client_->received_media_packet());
-    }
   }
 
   void SetupAndVerifyDtlsCall() {
     MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
     FakeConstraints setup_constraints;
     setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
                                    true);
     ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
     LocalP2PTest();
     VerifyRenderedSize(640, 480);
@@ skipping 912 matching lines @@
   PeerConnectionInterface::IceServer server;
   server.urls.push_back("turn:hostname");
   server.urls.push_back("turn:hostname2");
   servers.push_back(server);
   EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
   EXPECT_EQ(2U, turn_servers_.size());
   EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
 }
 
 #endif // if !defined(THREAD_SANITIZER)