Remove use of DeviceManager from ChannelManager.

talk/app/webrtc/mediastreamsignaling_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 19 matching lines @@
 
 #include "talk/app/webrtc/audiotrack.h"
 #include "talk/app/webrtc/mediastream.h"
 #include "talk/app/webrtc/mediastreamsignaling.h"
 #include "talk/app/webrtc/sctputils.h"
 #include "talk/app/webrtc/streamcollection.h"
 #include "talk/app/webrtc/test/fakeconstraints.h"
 #include "talk/app/webrtc/test/fakedatachannelprovider.h"
 #include "talk/app/webrtc/videotrack.h"
 #include "talk/media/base/fakemediaengine.h"
-#include "talk/media/devices/fakedevicemanager.h"
 #include "webrtc/p2p/base/constants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread.h"
 
 static const char kStreams[][8] = {"stream1", "stream2"};
 static const char kAudioTracks[][32] = {"audiotrack0", "audiotrack1"};
@@ skipping 424 matching lines @@
   using webrtc::MediaStreamSignaling::OnRemoteDescriptionChanged;
   using webrtc::MediaStreamSignaling::remote_streams;
 };
 
 class MediaStreamSignalingTest: public testing::Test {
  protected:
   virtual void SetUp() {
     observer_.reset(new MockSignalingObserver());
     channel_manager_.reset(
         new cricket::ChannelManager(new cricket::FakeMediaEngine(),
-                                    new cricket::FakeDeviceManager(),
                                     rtc::Thread::Current()));
     signaling_.reset(new MediaStreamSignalingForTest(observer_.get(),
                                                      channel_manager_.get()));
     data_channel_provider_.reset(new FakeDataChannelProvider());
   }
 
   // Create a collection of streams.
   // CreateStreamCollection(1) creates a collection that
   // correspond to kSdpString1.
   // CreateStreamCollection(2) correspond to kSdpString2.
@@ skipping 841 matching lines @@
   webrtc::WriteDataChannelOpenMessage("a", config, &payload);
   cricket::ReceiveDataParams params;
   params.ssrc = config.id;
   EXPECT_TRUE(signaling_->AddDataChannelFromOpenMessage(params, payload));
   EXPECT_TRUE(signaling_->HasDataChannels());
 
   // Removes the DataChannel and verifies that no DataChannel is left.
   signaling_->RemoveSctpDataChannel(config.id);
   EXPECT_FALSE(signaling_->HasDataChannels());
 }