Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: content/renderer/media/mock_media_stream_dependency_factory.cc

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 5 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/renderer/media/mock_peer_connection_impl.h" 9 #include "content/renderer/media/mock_peer_connection_impl.h"
10 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 10 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
11 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h" 11 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
12 #include "third_party/libjingle/source/talk/media/base/videocapturer.h" 12 #include "third_party/libjingle/source/talk/media/base/videocapturer.h"
13 13
14 using webrtc::AudioSourceInterface; 14 using webrtc::AudioSourceInterface;
15 using webrtc::AudioTrackInterface; 15 using webrtc::AudioTrackInterface;
16 using webrtc::AudioTrackVector; 16 using webrtc::AudioTrackVector;
17 using webrtc::IceCandidateCollection; 17 using webrtc::IceCandidateCollection;
18 using webrtc::IceCandidateInterface; 18 using webrtc::IceCandidateInterface;
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 505
506 webrtc::IceCandidateInterface* 506 webrtc::IceCandidateInterface*
507 MockMediaStreamDependencyFactory::CreateIceCandidate( 507 MockMediaStreamDependencyFactory::CreateIceCandidate(
508 const std::string& sdp_mid, 508 const std::string& sdp_mid,
509 int sdp_mline_index, 509 int sdp_mline_index,
510 const std::string& sdp) { 510 const std::string& sdp) {
511 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp); 511 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp);
512 } 512 }
513 513
514 } // namespace content 514 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_impl_unittest.cc ('k') | content/renderer/media/mock_media_stream_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698