Revert of Remove various IDs

modules/audio_coding/test/TwoWayCommunication.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 16 matching lines @@
 #include "modules/audio_coding/test/utility.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
 namespace webrtc {
 
 #define MAX_FILE_NAME_LENGTH_BYTE 500
 
 TwoWayCommunication::TwoWayCommunication(int testMode)
-    : _acmA(AudioCodingModule::Create()),
-      _acmRefA(AudioCodingModule::Create()),
+    : _acmA(AudioCodingModule::Create(1)),
+      _acmRefA(AudioCodingModule::Create(3)),
       _testMode(testMode) {
   AudioCodingModule::Config config;
   // The clicks will be more obvious in FAX mode. TODO(henrik.lundin) Really?
   config.neteq_config.playout_mode = kPlayoutFax;
+  config.id = 2;
   config.decoder_factory = CreateBuiltinAudioDecoderFactory();
   _acmB.reset(AudioCodingModule::Create(config));
+  config.id = 4;
   _acmRefB.reset(AudioCodingModule::Create(config));
 }
 
 TwoWayCommunication::~TwoWayCommunication() {
   delete _channel_A2B;
   delete _channel_B2A;
   delete _channelRef_A2B;
   delete _channelRef_B2A;
   _inFileA.Close();
   _inFileB.Close();
   _outFileA.Close();
   _outFileB.Close();
   _outFileRefA.Close();
   _outFileRefB.Close();
 }
 
 void TwoWayCommunication::ChooseCodec(uint8_t* codecID_A,
                                       uint8_t* codecID_B) {
-  std::unique_ptr<AudioCodingModule> tmpACM(AudioCodingModule::Create());
+  std::unique_ptr<AudioCodingModule> tmpACM(AudioCodingModule::Create(0));
   uint8_t noCodec = tmpACM->NumberOfCodecs();
   CodecInst codecInst;
   printf("List of Supported Codecs\n");
   printf("========================\n");
   for (uint8_t codecCntr = 0; codecCntr < noCodec; codecCntr++) {
     EXPECT_EQ(tmpACM->Codec(codecCntr, &codecInst), 0);
     printf("%d- %s\n", codecCntr, codecInst.plname);
   }
   printf("\nChoose a send codec for side A [0]: ");
   char myStr[15] = "";
@@ skipping 224 matching lines @@
       EXPECT_EQ(0, _acmA->InitializeReceiver());
     // Re-register codec on side A.
     if (((secPassed % 7) == 6) && (msecPassed >= 990)) {
       EXPECT_EQ(true, _acmA->RegisterReceiveCodec(
                           codecInst_B->pltype, CodecInstToSdp(*codecInst_B)));
     }
   }
 }
 
 }  // namespace webrtc