Revert of TransportController refactoring.

talk/app/webrtc/objctests/RTCPeerConnectionTest.mm

 /*
  * libjingle
  * Copyright 2013 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 164 matching lines @@
   sdpObserver = [[RTCSessionDescriptionSyncObserver alloc] init];
   [pcAnswer createAnswerWithDelegate:sdpObserver constraints:constraints];
   [sdpObserver wait];
   EXPECT_TRUE(sdpObserver.success);
   RTCSessionDescription* answerSDP = sdpObserver.sessionDescription;
   EXPECT_EQ([@"answer" compare:answerSDP.type options:NSCaseInsensitiveSearch],
             NSOrderedSame);
   EXPECT_GT([answerSDP.description length], 0);
 
   [offeringExpectations expectICECandidates:2];
-  // It's possible to only have 1 ICE candidate for the answerer, since we use
-  // BUNDLE and rtcp-mux by default, and don't provide any ICE servers in this
-  // test.
-  [answeringExpectations expectICECandidates:1];
+  [answeringExpectations expectICECandidates:2];
 
   sdpObserver = [[RTCSessionDescriptionSyncObserver alloc] init];
   [answeringExpectations expectSignalingChange:RTCSignalingStable];
   [pcAnswer setLocalDescriptionWithDelegate:sdpObserver
                          sessionDescription:answerSDP];
   [sdpObserver wait];
   EXPECT_TRUE(sdpObserver.sessionDescription == NULL);
 
   sdpObserver = [[RTCSessionDescriptionSyncObserver alloc] init];
   [offeringExpectations expectSignalingChange:RTCSignalingHaveLocalOffer];
@@ skipping 120 matching lines @@
     // factory outlives RTCPeerConnection:dealloc.
     // See https://code.google.com/p/webrtc/issues/detail?id=3100.
     RTCPeerConnectionFactory* factory = [[RTCPeerConnectionFactory alloc] init];
     @autoreleasepool {
       RTCPeerConnectionTest* pcTest = [[RTCPeerConnectionTest alloc] init];
       [pcTest testCompleteSessionWithFactory:factory];
     }
     rtc::CleanupSSL();
   }
 }