diff --git a/talk/app/webrtc/audiotrackrenderer.h b/talk/app/webrtc/audiotrackrenderer.h index 4a9bf6e767..50da0975bd 100644 --- a/talk/app/webrtc/audiotrackrenderer.h +++ b/talk/app/webrtc/audiotrackrenderer.h @@ -28,8 +28,8 @@ #ifndef TALK_APP_WEBRTC_AUDIOTRACKRENDERER_H_ #define TALK_APP_WEBRTC_AUDIOTRACKRENDERER_H_ -#include "webrtc/base/thread.h" #include "talk/media/base/audiorenderer.h" +#include "webrtc/base/thread.h" namespace webrtc { diff --git a/talk/app/webrtc/datachannel.h b/talk/app/webrtc/datachannel.h index 184ad91b88..728d1df90c 100644 --- a/talk/app/webrtc/datachannel.h +++ b/talk/app/webrtc/datachannel.h @@ -28,16 +28,16 @@ #ifndef TALK_APP_WEBRTC_DATACHANNEL_H_ #define TALK_APP_WEBRTC_DATACHANNEL_H_ -#include #include +#include #include "talk/app/webrtc/datachannelinterface.h" #include "talk/app/webrtc/proxy.h" +#include "talk/media/base/mediachannel.h" +#include "talk/session/media/channel.h" #include "webrtc/base/messagehandler.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/sigslot.h" -#include "talk/media/base/mediachannel.h" -#include "talk/session/media/channel.h" namespace webrtc { diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index fadbc8a82b..9b34fb596c 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -57,19 +57,15 @@ #define JNIEXPORT __attribute__((visibility("default"))) #include -#include -#include #include #include #include +#include +#include #include "talk/app/webrtc/mediaconstraintsinterface.h" #include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/videosourceinterface.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/ssladapter.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videorenderer.h" #include "talk/media/devices/videorendererfactory.h" @@ -80,6 +76,10 @@ #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/ssladapter.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/system_wrappers/interface/compile_assert.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java index f0c56ee0eb..a6a059e0b7 100644 --- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java +++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java @@ -28,8 +28,8 @@ package org.webrtc; import android.media.MediaCodec; -import android.media.MediaCodecInfo; import android.media.MediaCodecInfo.CodecCapabilities; +import android.media.MediaCodecInfo; import android.media.MediaCodecList; import android.media.MediaFormat; import android.os.Build; diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java index b1029dc4f9..45b8d6ad60 100644 --- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java +++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java @@ -29,10 +29,10 @@ package org.webrtc; import android.media.MediaCodec; +import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo; import android.media.MediaCodecList; import android.media.MediaFormat; -import android.media.MediaCodecInfo.CodecCapabilities; import android.os.Build; import android.os.Bundle; import android.util.Log; diff --git a/talk/app/webrtc/jsepicecandidate.h b/talk/app/webrtc/jsepicecandidate.h index 3463c828a3..7be420c3ac 100644 --- a/talk/app/webrtc/jsepicecandidate.h +++ b/talk/app/webrtc/jsepicecandidate.h @@ -33,8 +33,8 @@ #include #include "talk/app/webrtc/jsep.h" -#include "webrtc/base/constructormagic.h" #include "talk/p2p/base/candidate.h" +#include "webrtc/base/constructormagic.h" namespace webrtc { diff --git a/talk/app/webrtc/jsepsessiondescription.cc b/talk/app/webrtc/jsepsessiondescription.cc index eb42392938..23a7cdde60 100644 --- a/talk/app/webrtc/jsepsessiondescription.cc +++ b/talk/app/webrtc/jsepsessiondescription.cc @@ -27,8 +27,8 @@ #include "talk/app/webrtc/jsepsessiondescription.h" #include "talk/app/webrtc/webrtcsdp.h" -#include "webrtc/base/stringencode.h" #include "talk/session/media/mediasession.h" +#include "webrtc/base/stringencode.h" using rtc::scoped_ptr; using cricket::SessionDescription; diff --git a/talk/app/webrtc/jsepsessiondescription_unittest.cc b/talk/app/webrtc/jsepsessiondescription_unittest.cc index 12db9d4adc..5f5d8086b3 100644 --- a/talk/app/webrtc/jsepsessiondescription_unittest.cc +++ b/talk/app/webrtc/jsepsessiondescription_unittest.cc @@ -29,15 +29,15 @@ #include "talk/app/webrtc/jsepicecandidate.h" #include "talk/app/webrtc/jsepsessiondescription.h" +#include "talk/p2p/base/candidate.h" +#include "talk/p2p/base/constants.h" +#include "talk/p2p/base/sessiondescription.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/stringencode.h" -#include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/constants.h" -#include "talk/p2p/base/sessiondescription.h" -#include "talk/session/media/mediasession.h" using webrtc::IceCandidateCollection; using webrtc::IceCandidateInterface; diff --git a/talk/app/webrtc/localaudiosource.cc b/talk/app/webrtc/localaudiosource.cc index e82280ea66..6d3b89fc6b 100644 --- a/talk/app/webrtc/localaudiosource.cc +++ b/talk/app/webrtc/localaudiosource.cc @@ -29,8 +29,8 @@ #include -#include "talk/media/base/mediaengine.h" #include "talk/app/webrtc/mediaconstraintsinterface.h" +#include "talk/media/base/mediaengine.h" using webrtc::MediaConstraintsInterface; using webrtc::MediaSourceInterface; diff --git a/talk/app/webrtc/localaudiosource.h b/talk/app/webrtc/localaudiosource.h index 84fa763c58..51ab387c2a 100644 --- a/talk/app/webrtc/localaudiosource.h +++ b/talk/app/webrtc/localaudiosource.h @@ -31,8 +31,8 @@ #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/notifier.h" #include "talk/app/webrtc/peerconnectioninterface.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/mediachannel.h" +#include "webrtc/base/scoped_ptr.h" // LocalAudioSource implements AudioSourceInterface. // This contains settings for switching audio processing on and off. diff --git a/talk/app/webrtc/localaudiosource_unittest.cc b/talk/app/webrtc/localaudiosource_unittest.cc index 2e045eed86..c3618aa7db 100644 --- a/talk/app/webrtc/localaudiosource_unittest.cc +++ b/talk/app/webrtc/localaudiosource_unittest.cc @@ -31,10 +31,10 @@ #include #include "talk/app/webrtc/test/fakeconstraints.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/fakevideorenderer.h" #include "talk/media/devices/fakedevicemanager.h" +#include "webrtc/base/gunit.h" using webrtc::LocalAudioSource; using webrtc::MediaConstraintsInterface; diff --git a/talk/app/webrtc/mediastream_unittest.cc b/talk/app/webrtc/mediastream_unittest.cc index 4711e9cba0..bb1a73f02a 100644 --- a/talk/app/webrtc/mediastream_unittest.cc +++ b/talk/app/webrtc/mediastream_unittest.cc @@ -30,11 +30,11 @@ #include "talk/app/webrtc/audiotrack.h" #include "talk/app/webrtc/mediastream.h" #include "talk/app/webrtc/videotrack.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/gunit.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ptr.h" static const char kStreamLabel1[] = "local_stream_1"; static const char kVideoTrackId[] = "dummy_video_cam_1"; diff --git a/talk/app/webrtc/mediastreamhandler.h b/talk/app/webrtc/mediastreamhandler.h index 63864ced6d..c75bb9d89b 100644 --- a/talk/app/webrtc/mediastreamhandler.h +++ b/talk/app/webrtc/mediastreamhandler.h @@ -39,8 +39,8 @@ #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/mediastreamprovider.h" #include "talk/app/webrtc/peerconnectioninterface.h" -#include "webrtc/base/thread.h" #include "talk/media/base/audiorenderer.h" +#include "webrtc/base/thread.h" namespace webrtc { diff --git a/talk/app/webrtc/mediastreamhandler_unittest.cc b/talk/app/webrtc/mediastreamhandler_unittest.cc index 772708660b..61dbfe0516 100644 --- a/talk/app/webrtc/mediastreamhandler_unittest.cc +++ b/talk/app/webrtc/mediastreamhandler_unittest.cc @@ -35,11 +35,11 @@ #include "talk/app/webrtc/streamcollection.h" #include "talk/app/webrtc/videosource.h" #include "talk/app/webrtc/videotrack.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/mediachannel.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/gunit.h" using ::testing::_; using ::testing::Exactly; diff --git a/talk/app/webrtc/mediastreamsignaling.cc b/talk/app/webrtc/mediastreamsignaling.cc index 7cdd5ed1cc..c4a8281da7 100644 --- a/talk/app/webrtc/mediastreamsignaling.cc +++ b/talk/app/webrtc/mediastreamsignaling.cc @@ -30,17 +30,17 @@ #include #include "talk/app/webrtc/audiotrack.h" -#include "talk/app/webrtc/mediastreamproxy.h" #include "talk/app/webrtc/mediaconstraintsinterface.h" +#include "talk/app/webrtc/mediastreamproxy.h" #include "talk/app/webrtc/mediastreamtrackproxy.h" #include "talk/app/webrtc/remoteaudiosource.h" #include "talk/app/webrtc/remotevideocapturer.h" #include "talk/app/webrtc/sctputils.h" #include "talk/app/webrtc/videosource.h" #include "talk/app/webrtc/videotrack.h" +#include "talk/media/sctp/sctpdataengine.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/stringutils.h" -#include "talk/media/sctp/sctpdataengine.h" static const char kDefaultStreamLabel[] = "default"; static const char kDefaultAudioTrackLabel[] = "defaulta0"; diff --git a/talk/app/webrtc/mediastreamsignaling.h b/talk/app/webrtc/mediastreamsignaling.h index 214c6a1167..7f17971fb2 100644 --- a/talk/app/webrtc/mediastreamsignaling.h +++ b/talk/app/webrtc/mediastreamsignaling.h @@ -28,17 +28,17 @@ #ifndef TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ #define TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ +#include #include #include -#include #include "talk/app/webrtc/datachannel.h" #include "talk/app/webrtc/mediastream.h" #include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/streamcollection.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/sigslot.h" -#include "talk/session/media/mediasession.h" namespace rtc { class Thread; diff --git a/talk/app/webrtc/mediastreamsignaling_unittest.cc b/talk/app/webrtc/mediastreamsignaling_unittest.cc index 3c89d49511..fa83646085 100644 --- a/talk/app/webrtc/mediastreamsignaling_unittest.cc +++ b/talk/app/webrtc/mediastreamsignaling_unittest.cc @@ -36,15 +36,15 @@ #include "talk/app/webrtc/test/fakeconstraints.h" #include "talk/app/webrtc/test/fakedatachannelprovider.h" #include "talk/app/webrtc/videotrack.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/devices/fakedevicemanager.h" #include "talk/p2p/base/constants.h" #include "talk/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"}; diff --git a/talk/app/webrtc/notifier.h b/talk/app/webrtc/notifier.h index 0237ecf3e0..1d2c333323 100644 --- a/talk/app/webrtc/notifier.h +++ b/talk/app/webrtc/notifier.h @@ -30,8 +30,8 @@ #include -#include "webrtc/base/common.h" #include "talk/app/webrtc/mediastreaminterface.h" +#include "webrtc/base/common.h" namespace webrtc { diff --git a/talk/app/webrtc/objc/RTCI420Frame.mm b/talk/app/webrtc/objc/RTCI420Frame.mm index 61903bc16e..0b506919f5 100644 --- a/talk/app/webrtc/objc/RTCI420Frame.mm +++ b/talk/app/webrtc/objc/RTCI420Frame.mm @@ -27,8 +27,8 @@ #import "RTCI420Frame.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/scoped_ptr.h" @implementation RTCI420Frame { rtc::scoped_ptr _videoFrame; diff --git a/talk/app/webrtc/objc/RTCMediaStreamTrack.mm b/talk/app/webrtc/objc/RTCMediaStreamTrack.mm index a821bcc3f1..57a9fde14b 100644 --- a/talk/app/webrtc/objc/RTCMediaStreamTrack.mm +++ b/talk/app/webrtc/objc/RTCMediaStreamTrack.mm @@ -29,8 +29,8 @@ #error "This file requires ARC support." #endif -#import "RTCMediaStreamTrack+Internal.h" #import "RTCEnumConverter.h" +#import "RTCMediaStreamTrack+Internal.h" namespace webrtc { diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm index 58c13422cb..72ba373803 100644 --- a/talk/app/webrtc/objc/RTCPeerConnection.mm +++ b/talk/app/webrtc/objc/RTCPeerConnection.mm @@ -40,8 +40,8 @@ #import "RTCMediaStreamTrack+Internal.h" #import "RTCPeerConnectionObserver.h" #import "RTCSessionDescription+Internal.h" -#import "RTCSessionDescriptionDelegate.h" #import "RTCSessionDescription.h" +#import "RTCSessionDescriptionDelegate.h" #import "RTCStatsDelegate.h" #import "RTCStatsReport+Internal.h" diff --git a/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm b/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm index 061ccf0a92..a0206e5b29 100644 --- a/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm +++ b/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm @@ -32,9 +32,9 @@ #import "RTCPeerConnectionObserver.h" #import "RTCDataChannel+Internal.h" +#import "RTCEnumConverter.h" #import "RTCICECandidate+Internal.h" #import "RTCMediaStream+Internal.h" -#import "RTCEnumConverter.h" namespace webrtc { diff --git a/talk/app/webrtc/objc/RTCVideoSource.mm b/talk/app/webrtc/objc/RTCVideoSource.mm index 7ad423c523..f573309131 100644 --- a/talk/app/webrtc/objc/RTCVideoSource.mm +++ b/talk/app/webrtc/objc/RTCVideoSource.mm @@ -29,8 +29,8 @@ #error "This file requires ARC support." #endif -#import "RTCVideoSource+Internal.h" #import "RTCMediaSource+Internal.h" +#import "RTCVideoSource+Internal.h" @implementation RTCVideoSource @end diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index 1e42de3ae7..201269ad57 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -35,10 +35,10 @@ #include "talk/app/webrtc/mediaconstraintsinterface.h" #include "talk/app/webrtc/mediastreamhandler.h" #include "talk/app/webrtc/streamcollection.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" #include "talk/p2p/client/basicportallocator.h" #include "talk/session/media/channelmanager.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringencode.h" namespace { diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h index b1d44624d2..fb038020e5 100644 --- a/talk/app/webrtc/peerconnection.h +++ b/talk/app/webrtc/peerconnection.h @@ -31,8 +31,8 @@ #include #include "talk/app/webrtc/mediastreamsignaling.h" -#include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/peerconnectionfactory.h" +#include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/statscollector.h" #include "talk/app/webrtc/streamcollection.h" #include "talk/app/webrtc/webrtcsession.h" diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index 3776809b41..ca022c6c30 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -41,19 +41,19 @@ #include "talk/app/webrtc/test/fakeaudiocapturemodule.h" #include "talk/app/webrtc/test/fakeconstraints.h" #include "talk/app/webrtc/test/fakedtlsidentityservice.h" -#include "talk/app/webrtc/test/fakevideotrackrenderer.h" #include "talk/app/webrtc/test/fakeperiodicvideocapturer.h" +#include "talk/app/webrtc/test/fakevideotrackrenderer.h" #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" #include "talk/app/webrtc/videosourceinterface.h" +#include "talk/media/webrtc/fakewebrtcvideoengine.h" +#include "talk/p2p/base/constants.h" +#include "talk/p2p/base/sessiondescription.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/sslstreamadapter.h" #include "webrtc/base/thread.h" -#include "talk/media/webrtc/fakewebrtcvideoengine.h" -#include "talk/p2p/base/constants.h" -#include "talk/p2p/base/sessiondescription.h" -#include "talk/session/media/mediasession.h" #define MAYBE_SKIP_TEST(feature) \ if (!(feature())) { \ diff --git a/talk/app/webrtc/peerconnectionendtoend_unittest.cc b/talk/app/webrtc/peerconnectionendtoend_unittest.cc index 898478170c..572c17512d 100644 --- a/talk/app/webrtc/peerconnectionendtoend_unittest.cc +++ b/talk/app/webrtc/peerconnectionendtoend_unittest.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/app/webrtc/test/peerconnectiontestwrapper.h" #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" +#include "talk/app/webrtc/test/peerconnectiontestwrapper.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/ssladapter.h" diff --git a/talk/app/webrtc/peerconnectionfactory.h b/talk/app/webrtc/peerconnectionfactory.h index 2cadaaa86e..119b7cd129 100644 --- a/talk/app/webrtc/peerconnectionfactory.h +++ b/talk/app/webrtc/peerconnectionfactory.h @@ -31,9 +31,9 @@ #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/peerconnectioninterface.h" +#include "talk/session/media/channelmanager.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" -#include "talk/session/media/channelmanager.h" namespace webrtc { diff --git a/talk/app/webrtc/peerconnectionfactory_unittest.cc b/talk/app/webrtc/peerconnectionfactory_unittest.cc index a18069e85f..5995c46dcc 100644 --- a/talk/app/webrtc/peerconnectionfactory_unittest.cc +++ b/talk/app/webrtc/peerconnectionfactory_unittest.cc @@ -30,14 +30,14 @@ #include "talk/app/webrtc/fakeportallocatorfactory.h" #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/peerconnectionfactory.h" -#include "talk/app/webrtc/videosourceinterface.h" #include "talk/app/webrtc/test/fakevideotrackrenderer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/thread.h" +#include "talk/app/webrtc/videosourceinterface.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/webrtc/webrtccommon.h" #include "talk/media/webrtc/webrtcvoe.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread.h" using webrtc::FakeVideoTrackRenderer; using webrtc::MediaStreamInterface; diff --git a/talk/app/webrtc/peerconnectioninterface_unittest.cc b/talk/app/webrtc/peerconnectioninterface_unittest.cc index 1eef82e127..e957b21268 100644 --- a/talk/app/webrtc/peerconnectioninterface_unittest.cc +++ b/talk/app/webrtc/peerconnectioninterface_unittest.cc @@ -36,15 +36,15 @@ #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" #include "talk/app/webrtc/test/testsdpstrings.h" #include "talk/app/webrtc/videosource.h" +#include "talk/media/base/fakevideocapturer.h" +#include "talk/media/sctp/sctpdataengine.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/sslstreamadapter.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" -#include "talk/media/base/fakevideocapturer.h" -#include "talk/media/sctp/sctpdataengine.h" -#include "talk/session/media/mediasession.h" static const char kStreamLabel1[] = "local_stream_1"; static const char kStreamLabel2[] = "local_stream_2"; diff --git a/talk/app/webrtc/portallocatorfactory.cc b/talk/app/webrtc/portallocatorfactory.cc index 9d040f9b63..946f8ade57 100644 --- a/talk/app/webrtc/portallocatorfactory.cc +++ b/talk/app/webrtc/portallocatorfactory.cc @@ -27,11 +27,11 @@ #include "talk/app/webrtc/portallocatorfactory.h" +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/client/basicportallocator.h" #include "webrtc/base/logging.h" #include "webrtc/base/network.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/client/basicportallocator.h" namespace webrtc { diff --git a/talk/app/webrtc/proxy_unittest.cc b/talk/app/webrtc/proxy_unittest.cc index 1cab48436c..9173f06ba8 100644 --- a/talk/app/webrtc/proxy_unittest.cc +++ b/talk/app/webrtc/proxy_unittest.cc @@ -29,11 +29,11 @@ #include +#include "testing/base/public/gmock.h" +#include "webrtc/base/gunit.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" -#include "webrtc/base/gunit.h" -#include "testing/base/public/gmock.h" using ::testing::_; using ::testing::DoAll; diff --git a/talk/app/webrtc/remotevideocapturer.cc b/talk/app/webrtc/remotevideocapturer.cc index a76a5302d1..263d6e80d7 100644 --- a/talk/app/webrtc/remotevideocapturer.cc +++ b/talk/app/webrtc/remotevideocapturer.cc @@ -27,8 +27,8 @@ #include "talk/app/webrtc/remotevideocapturer.h" -#include "webrtc/base/logging.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/logging.h" namespace webrtc { diff --git a/talk/app/webrtc/remotevideocapturer_unittest.cc b/talk/app/webrtc/remotevideocapturer_unittest.cc index d66ff01b41..396ef295d3 100644 --- a/talk/app/webrtc/remotevideocapturer_unittest.cc +++ b/talk/app/webrtc/remotevideocapturer_unittest.cc @@ -28,8 +28,8 @@ #include #include "talk/app/webrtc/remotevideocapturer.h" -#include "webrtc/base/gunit.h" #include "talk/media/webrtc/webrtcvideoframe.h" +#include "webrtc/base/gunit.h" using cricket::CaptureState; using cricket::VideoCapturer; diff --git a/talk/app/webrtc/sctputils_unittest.cc b/talk/app/webrtc/sctputils_unittest.cc index ec2c850231..164f6dd23b 100644 --- a/talk/app/webrtc/sctputils_unittest.cc +++ b/talk/app/webrtc/sctputils_unittest.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/app/webrtc/sctputils.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/gunit.h" -#include "talk/app/webrtc/sctputils.h" class SctpUtilsTest : public testing::Test { public: diff --git a/talk/app/webrtc/statscollector.cc b/talk/app/webrtc/statscollector.cc index df7a44ec2f..5271827fbf 100644 --- a/talk/app/webrtc/statscollector.cc +++ b/talk/app/webrtc/statscollector.cc @@ -30,10 +30,10 @@ #include #include +#include "talk/session/media/channel.h" #include "webrtc/base/base64.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/timing.h" -#include "talk/session/media/channel.h" namespace webrtc { diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc index b363e4f50c..2f4c1305b0 100644 --- a/talk/app/webrtc/statscollector_unittest.cc +++ b/talk/app/webrtc/statscollector_unittest.cc @@ -33,15 +33,15 @@ #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/mediastreamtrack.h" #include "talk/app/webrtc/videotrack.h" -#include "webrtc/base/base64.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/devices/fakedevicemanager.h" #include "talk/p2p/base/fakesession.h" #include "talk/session/media/channelmanager.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" using cricket::StatsOptions; using testing::_; diff --git a/talk/app/webrtc/test/fakeperiodicvideocapturer.h b/talk/app/webrtc/test/fakeperiodicvideocapturer.h index 35388403b5..7603764672 100644 --- a/talk/app/webrtc/test/fakeperiodicvideocapturer.h +++ b/talk/app/webrtc/test/fakeperiodicvideocapturer.h @@ -31,8 +31,8 @@ #ifndef TALK_APP_WEBRTC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ #define TALK_APP_WEBRTC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ -#include "webrtc/base/thread.h" #include "talk/media/base/fakevideocapturer.h" +#include "webrtc/base/thread.h" namespace webrtc { diff --git a/talk/app/webrtc/videosource.h b/talk/app/webrtc/videosource.h index e690a5d737..830bdf1993 100644 --- a/talk/app/webrtc/videosource.h +++ b/talk/app/webrtc/videosource.h @@ -32,10 +32,10 @@ #include "talk/app/webrtc/notifier.h" #include "talk/app/webrtc/videosourceinterface.h" #include "talk/app/webrtc/videotrackrenderers.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sigslot.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sigslot.h" // VideoSource implements VideoSourceInterface. It owns a // cricket::VideoCapturer and make sure the camera is started at a resolution diff --git a/talk/app/webrtc/videosource_unittest.cc b/talk/app/webrtc/videosource_unittest.cc index 38b4afa0b4..d9d8acf58f 100644 --- a/talk/app/webrtc/videosource_unittest.cc +++ b/talk/app/webrtc/videosource_unittest.cc @@ -28,15 +28,15 @@ #include #include -#include "talk/app/webrtc/test/fakeconstraints.h" #include "talk/app/webrtc/remotevideocapturer.h" +#include "talk/app/webrtc/test/fakeconstraints.h" #include "talk/app/webrtc/videosource.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/fakevideorenderer.h" #include "talk/media/devices/fakedevicemanager.h" #include "talk/media/webrtc/webrtcvideoframe.h" #include "talk/session/media/channelmanager.h" +#include "webrtc/base/gunit.h" using webrtc::FakeConstraints; using webrtc::VideoSource; diff --git a/talk/app/webrtc/videotrack_unittest.cc b/talk/app/webrtc/videotrack_unittest.cc index 57b883d1a7..5fe979fc8a 100644 --- a/talk/app/webrtc/videotrack_unittest.cc +++ b/talk/app/webrtc/videotrack_unittest.cc @@ -27,16 +27,16 @@ #include -#include "talk/app/webrtc/test/fakevideotrackrenderer.h" #include "talk/app/webrtc/remotevideocapturer.h" +#include "talk/app/webrtc/test/fakevideotrackrenderer.h" #include "talk/app/webrtc/videosource.h" #include "talk/app/webrtc/videotrack.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/devices/fakedevicemanager.h" #include "talk/media/webrtc/webrtcvideoframe.h" #include "talk/session/media/channelmanager.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/scoped_ptr.h" using webrtc::FakeVideoTrackRenderer; using webrtc::VideoSource; diff --git a/talk/app/webrtc/videotrackrenderers.h b/talk/app/webrtc/videotrackrenderers.h index a6ba0945b5..4fba318e83 100644 --- a/talk/app/webrtc/videotrackrenderers.h +++ b/talk/app/webrtc/videotrackrenderers.h @@ -31,8 +31,8 @@ #include #include "talk/app/webrtc/mediastreaminterface.h" -#include "webrtc/base/criticalsection.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/criticalsection.h" namespace webrtc { diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc index 09e5cbd9c3..792a091474 100644 --- a/talk/app/webrtc/webrtcsdp.cc +++ b/talk/app/webrtc/webrtcsdp.cc @@ -35,10 +35,6 @@ #include "talk/app/webrtc/jsepicecandidate.h" #include "talk/app/webrtc/jsepsessiondescription.h" -#include "webrtc/base/common.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/codec.h" #include "talk/media/base/constants.h" #include "talk/media/base/cryptoparams.h" @@ -48,6 +44,10 @@ #include "talk/p2p/base/port.h" #include "talk/session/media/mediasession.h" #include "talk/session/media/mediasessionclient.h" +#include "webrtc/base/common.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/stringutils.h" using cricket::AudioContentDescription; using cricket::Candidate; diff --git a/talk/app/webrtc/webrtcsdp_unittest.cc b/talk/app/webrtc/webrtcsdp_unittest.cc index 3629347d4c..6a22e389a6 100644 --- a/talk/app/webrtc/webrtcsdp_unittest.cc +++ b/talk/app/webrtc/webrtcsdp_unittest.cc @@ -31,6 +31,9 @@ #include "talk/app/webrtc/jsepsessiondescription.h" #include "talk/app/webrtc/webrtcsdp.h" +#include "talk/media/base/constants.h" +#include "talk/p2p/base/constants.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/messagedigest.h" @@ -38,9 +41,6 @@ #include "webrtc/base/sslfingerprint.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/stringutils.h" -#include "talk/media/base/constants.h" -#include "talk/p2p/base/constants.h" -#include "talk/session/media/mediasession.h" using cricket::AudioCodec; using cricket::AudioContentDescription; diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc index 7357a617b8..1f14ff7bf3 100644 --- a/talk/app/webrtc/webrtcsession.cc +++ b/talk/app/webrtc/webrtcsession.cc @@ -38,16 +38,16 @@ #include "talk/app/webrtc/mediastreamsignaling.h" #include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/constants.h" #include "talk/media/base/videocapturer.h" #include "talk/session/media/channel.h" #include "talk/session/media/channelmanager.h" #include "talk/session/media/mediasession.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" using cricket::ContentInfo; using cricket::ContentInfos; diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h index 564676dfd1..d1e5645b38 100644 --- a/talk/app/webrtc/webrtcsession.h +++ b/talk/app/webrtc/webrtcsession.h @@ -30,16 +30,16 @@ #include -#include "talk/app/webrtc/peerconnectioninterface.h" +#include "talk/app/webrtc/datachannel.h" #include "talk/app/webrtc/dtmfsender.h" #include "talk/app/webrtc/mediastreamprovider.h" -#include "talk/app/webrtc/datachannel.h" +#include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/statstypes.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "talk/media/base/mediachannel.h" #include "talk/p2p/base/session.h" #include "talk/session/media/mediasession.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc index 8bc8e8dca9..206f32067a 100644 --- a/talk/app/webrtc/webrtcsession_unittest.cc +++ b/talk/app/webrtc/webrtcsession_unittest.cc @@ -30,12 +30,22 @@ #include "talk/app/webrtc/jsepsessiondescription.h" #include "talk/app/webrtc/mediastreamsignaling.h" #include "talk/app/webrtc/streamcollection.h" -#include "talk/app/webrtc/videotrack.h" #include "talk/app/webrtc/test/fakeconstraints.h" #include "talk/app/webrtc/test/fakedtlsidentityservice.h" #include "talk/app/webrtc/test/fakemediastreamsignaling.h" +#include "talk/app/webrtc/videotrack.h" #include "talk/app/webrtc/webrtcsession.h" #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" +#include "talk/media/base/fakemediaengine.h" +#include "talk/media/base/fakevideorenderer.h" +#include "talk/media/base/mediachannel.h" +#include "talk/media/devices/fakedevicemanager.h" +#include "talk/p2p/base/stunserver.h" +#include "talk/p2p/base/teststunserver.h" +#include "talk/p2p/base/testturnserver.h" +#include "talk/p2p/client/basicportallocator.h" +#include "talk/session/media/channelmanager.h" +#include "talk/session/media/mediasession.h" #include "webrtc/base/fakenetwork.h" #include "webrtc/base/firewallsocketserver.h" #include "webrtc/base/gunit.h" @@ -47,16 +57,6 @@ #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/media/base/fakemediaengine.h" -#include "talk/media/base/fakevideorenderer.h" -#include "talk/media/base/mediachannel.h" -#include "talk/media/devices/fakedevicemanager.h" -#include "talk/p2p/base/stunserver.h" -#include "talk/p2p/base/teststunserver.h" -#include "talk/p2p/base/testturnserver.h" -#include "talk/p2p/client/basicportallocator.h" -#include "talk/session/media/channelmanager.h" -#include "talk/session/media/mediasession.h" #define MAYBE_SKIP_TEST(feature) \ if (!(feature())) { \ diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.h b/talk/app/webrtc/webrtcsessiondescriptionfactory.h index f94d35a851..b8708561fc 100644 --- a/talk/app/webrtc/webrtcsessiondescriptionfactory.h +++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.h @@ -29,9 +29,9 @@ #define TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ #include "talk/app/webrtc/peerconnectioninterface.h" -#include "webrtc/base/messagehandler.h" #include "talk/p2p/base/transportdescriptionfactory.h" #include "talk/session/media/mediasession.h" +#include "webrtc/base/messagehandler.h" namespace cricket { class ChannelManager; diff --git a/talk/examples/call/call_main.cc b/talk/examples/call/call_main.cc index b6168b35b1..cb309dc70b 100644 --- a/talk/examples/call/call_main.cc +++ b/talk/examples/call/call_main.cc @@ -38,10 +38,6 @@ #ifdef OSX #include "webrtc/base/maccocoasocketserver.h" #endif -#include "webrtc/base/pathutils.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stream.h" -#include "webrtc/base/win32socketserver.h" #include "talk/examples/call/callclient.h" #include "talk/examples/call/console.h" #include "talk/examples/call/mediaenginefactory.h" @@ -52,6 +48,10 @@ #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmpppump.h" #include "talk/xmpp/xmppsocket.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/win32socketserver.h" class DebugLog : public sigslot::has_slots<> { public: diff --git a/talk/examples/call/call_unittest.cc b/talk/examples/call/call_unittest.cc index 524726d6aa..cc2878fcee 100644 --- a/talk/examples/call/call_unittest.cc +++ b/talk/examples/call/call_unittest.cc @@ -27,8 +27,8 @@ // Main function for all unit tests in talk/examples/call -#include "webrtc/base/logging.h" #include "testing/base/public/gunit.h" +#include "webrtc/base/logging.h" int main(int argc, char **argv) { rtc::LogMessage::LogToDebug(rtc::LogMessage::NO_LOGGING); diff --git a/talk/examples/call/callclient.cc b/talk/examples/call/callclient.cc index 7d1cd80628..188f6c4a8b 100644 --- a/talk/examples/call/callclient.cc +++ b/talk/examples/call/callclient.cc @@ -29,14 +29,6 @@ #include -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/network.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/windowpickerfactory.h" #include "talk/examples/call/console.h" #include "talk/examples/call/friendinvitesendtask.h" #include "talk/examples/call/muc.h" @@ -47,6 +39,14 @@ #include "talk/media/base/mediaengine.h" #include "talk/media/base/rtpdataengine.h" #include "talk/media/base/screencastid.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/network.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/windowpickerfactory.h" #ifdef HAVE_SCTP #include "talk/media/sctp/sctpdataengine.h" #endif @@ -62,8 +62,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" #include "talk/xmpp/mucroomconfigtask.h" #include "talk/xmpp/mucroomlookuptask.h" -#include "talk/xmpp/presenceouttask.h" #include "talk/xmpp/pingtask.h" +#include "talk/xmpp/presenceouttask.h" namespace { diff --git a/talk/examples/call/callclient.h b/talk/examples/call/callclient.h index f25b9f5436..50c584b1bb 100644 --- a/talk/examples/call/callclient.h +++ b/talk/examples/call/callclient.h @@ -32,8 +32,6 @@ #include #include -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sslidentity.h" #include "talk/examples/call/console.h" #include "talk/media/base/mediachannel.h" #include "talk/p2p/base/session.h" @@ -42,6 +40,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" #include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppclient.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sslidentity.h" namespace buzz { class PresencePushTask; diff --git a/talk/examples/call/callclient_unittest.cc b/talk/examples/call/callclient_unittest.cc index 6268917047..d11580e134 100644 --- a/talk/examples/call/callclient_unittest.cc +++ b/talk/examples/call/callclient_unittest.cc @@ -27,11 +27,11 @@ // Unit tests for CallClient -#include "webrtc/base/gunit.h" #include "talk/examples/call/callclient.h" #include "talk/media/base/filemediaengine.h" #include "talk/media/base/mediaengine.h" #include "talk/xmpp/xmppthread.h" +#include "webrtc/base/gunit.h" TEST(CallClientTest, CreateCallClientWithDefaultMediaEngine) { buzz::XmppPump pump; diff --git a/talk/examples/call/console.cc b/talk/examples/call/console.cc index e3ed4f83e3..a0da2af9e4 100644 --- a/talk/examples/call/console.cc +++ b/talk/examples/call/console.cc @@ -35,11 +35,11 @@ #include #endif // POSIX +#include "talk/examples/call/callclient.h" +#include "talk/examples/call/console.h" #include "webrtc/base/logging.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/stringutils.h" -#include "talk/examples/call/console.h" -#include "talk/examples/call/callclient.h" #ifdef POSIX static void DoNothing(int unused) {} diff --git a/talk/examples/call/console.h b/talk/examples/call/console.h index 00b35a0909..abcae99cda 100644 --- a/talk/examples/call/console.h +++ b/talk/examples/call/console.h @@ -30,9 +30,9 @@ #include -#include "webrtc/base/thread.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread.h" class CallClient; diff --git a/talk/examples/call/friendinvitesendtask.cc b/talk/examples/call/friendinvitesendtask.cc index cdb0b2ccaa..dae10062ef 100644 --- a/talk/examples/call/friendinvitesendtask.cc +++ b/talk/examples/call/friendinvitesendtask.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/constants.h" #include "talk/examples/call/friendinvitesendtask.h" +#include "talk/xmpp/constants.h" namespace buzz { diff --git a/talk/examples/call/mediaenginefactory.cc b/talk/examples/call/mediaenginefactory.cc index 472a8807f5..dd62bf8b08 100644 --- a/talk/examples/call/mediaenginefactory.cc +++ b/talk/examples/call/mediaenginefactory.cc @@ -27,10 +27,10 @@ #include "talk/examples/call/mediaenginefactory.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/filemediaengine.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/stringutils.h" std::vector RequiredAudioCodecs() { std::vector audio_codecs; diff --git a/talk/examples/call/mucinviterecvtask.cc b/talk/examples/call/mucinviterecvtask.cc index 061db744ec..e32456fb6f 100644 --- a/talk/examples/call/mucinviterecvtask.cc +++ b/talk/examples/call/mucinviterecvtask.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/constants.h" #include "talk/examples/call/mucinviterecvtask.h" +#include "talk/xmpp/constants.h" namespace buzz { diff --git a/talk/examples/call/mucinviterecvtask.h b/talk/examples/call/mucinviterecvtask.h index 4ec06d00fe..ddfd6be856 100644 --- a/talk/examples/call/mucinviterecvtask.h +++ b/talk/examples/call/mucinviterecvtask.h @@ -30,9 +30,9 @@ #include -#include "webrtc/base/sigslot.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" +#include "webrtc/base/sigslot.h" namespace buzz { diff --git a/talk/examples/call/mucinvitesendtask.h b/talk/examples/call/mucinvitesendtask.h index 2429b31868..3ae74c16f5 100644 --- a/talk/examples/call/mucinvitesendtask.h +++ b/talk/examples/call/mucinvitesendtask.h @@ -28,9 +28,9 @@ #ifndef _MUCINVITESENDTASK_H_ #define _MUCINVITESENDTASK_H_ +#include "talk/examples/call/muc.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/examples/call/muc.h" namespace buzz { diff --git a/talk/examples/call/presencepushtask.cc b/talk/examples/call/presencepushtask.cc index 31ccc32b59..b598eb6530 100644 --- a/talk/examples/call/presencepushtask.cc +++ b/talk/examples/call/presencepushtask.cc @@ -27,9 +27,9 @@ #include "talk/examples/call/presencepushtask.h" -#include "webrtc/base/stringencode.h" #include "talk/examples/call/muc.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/stringencode.h" diff --git a/talk/examples/call/presencepushtask.h b/talk/examples/call/presencepushtask.h index 5a080d32ff..c13a4f506e 100644 --- a/talk/examples/call/presencepushtask.h +++ b/talk/examples/call/presencepushtask.h @@ -30,11 +30,11 @@ #include +#include "talk/examples/call/callclient.h" +#include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/xmpp/presencestatus.h" #include "webrtc/base/sigslot.h" -#include "talk/examples/call/callclient.h" namespace buzz { diff --git a/talk/examples/login/login_main.cc b/talk/examples/login/login_main.cc index 55243aab41..bfe12af686 100644 --- a/talk/examples/login/login_main.cc +++ b/talk/examples/login/login_main.cc @@ -29,11 +29,11 @@ #include -#include "webrtc/base/thread.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmppthread.h" +#include "webrtc/base/thread.h" int main(int argc, char **argv) { std::cout << "OAuth Access Token: "; diff --git a/talk/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch b/talk/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch index 3ac2c3b1a5..cf7719cf7e 100644 --- a/talk/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch +++ b/talk/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch @@ -36,5 +36,5 @@ #warning "This project uses features only available in iOS SDK 6.0 and later." #endif -#import #import +#import diff --git a/talk/examples/peerconnection/client/conductor.cc b/talk/examples/peerconnection/client/conductor.cc index 64026c58d5..f49aee6c6f 100644 --- a/talk/examples/peerconnection/client/conductor.cc +++ b/talk/examples/peerconnection/client/conductor.cc @@ -30,11 +30,11 @@ #include #include "talk/app/webrtc/videosourceinterface.h" +#include "talk/examples/peerconnection/client/defaults.h" +#include "talk/media/devices/devicemanager.h" #include "webrtc/base/common.h" #include "webrtc/base/json.h" #include "webrtc/base/logging.h" -#include "talk/examples/peerconnection/client/defaults.h" -#include "talk/media/devices/devicemanager.h" // Names used for a IceCandidate JSON object. const char kCandidateSdpMidName[] = "sdpMid"; diff --git a/talk/examples/peerconnection/client/conductor.h b/talk/examples/peerconnection/client/conductor.h index 93b077912e..0aff531322 100644 --- a/talk/examples/peerconnection/client/conductor.h +++ b/talk/examples/peerconnection/client/conductor.h @@ -34,10 +34,10 @@ #include #include -#include "talk/examples/peerconnection/client/main_wnd.h" -#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/peerconnectioninterface.h" +#include "talk/examples/peerconnection/client/main_wnd.h" +#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "webrtc/base/scoped_ptr.h" namespace webrtc { diff --git a/talk/examples/peerconnection/client/main_wnd.cc b/talk/examples/peerconnection/client/main_wnd.cc index 2296c426e2..05c73ec323 100644 --- a/talk/examples/peerconnection/client/main_wnd.cc +++ b/talk/examples/peerconnection/client/main_wnd.cc @@ -29,9 +29,9 @@ #include +#include "talk/examples/peerconnection/client/defaults.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "talk/examples/peerconnection/client/defaults.h" ATOM MainWnd::wnd_class_ = 0; const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; diff --git a/talk/examples/peerconnection/client/main_wnd.h b/talk/examples/peerconnection/client/main_wnd.h index e87153a3b8..08bdabbfd8 100644 --- a/talk/examples/peerconnection/client/main_wnd.h +++ b/talk/examples/peerconnection/client/main_wnd.h @@ -33,12 +33,12 @@ #include #include "talk/app/webrtc/mediastreaminterface.h" -#include "webrtc/base/win32.h" #include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/videocommon.h" #include "talk/media/base/videoframe.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/win32.h" class MainWndCallback { public: diff --git a/talk/examples/peerconnection/client/peer_connection_client.cc b/talk/examples/peerconnection/client/peer_connection_client.cc index e5bef05a41..3aaea41383 100644 --- a/talk/examples/peerconnection/client/peer_connection_client.cc +++ b/talk/examples/peerconnection/client/peer_connection_client.cc @@ -29,8 +29,8 @@ #include "talk/examples/peerconnection/client/defaults.h" #include "webrtc/base/common.h" -#include "webrtc/base/nethelpers.h" #include "webrtc/base/logging.h" +#include "webrtc/base/nethelpers.h" #include "webrtc/base/stringutils.h" #ifdef WIN32 diff --git a/talk/examples/peerconnection/client/peer_connection_client.h b/talk/examples/peerconnection/client/peer_connection_client.h index 3187895c45..7b897a5192 100644 --- a/talk/examples/peerconnection/client/peer_connection_client.h +++ b/talk/examples/peerconnection/client/peer_connection_client.h @@ -33,10 +33,10 @@ #include #include "webrtc/base/nethelpers.h" -#include "webrtc/base/signalthread.h" -#include "webrtc/base/sigslot.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/signalthread.h" +#include "webrtc/base/sigslot.h" typedef std::map Peers; diff --git a/talk/examples/peerconnection/server/main.cc b/talk/examples/peerconnection/server/main.cc index 9be3bbe843..1bdbfdc2bb 100644 --- a/talk/examples/peerconnection/server/main.cc +++ b/talk/examples/peerconnection/server/main.cc @@ -31,10 +31,10 @@ #include -#include "webrtc/base/flags.h" #include "talk/examples/peerconnection/server/data_socket.h" #include "talk/examples/peerconnection/server/peer_channel.h" #include "talk/examples/peerconnection/server/utils.h" +#include "webrtc/base/flags.h" DEFINE_bool(help, false, "Prints this message"); DEFINE_int(port, 8888, "The port on which to listen."); diff --git a/talk/examples/relayserver/relayserver_main.cc b/talk/examples/relayserver/relayserver_main.cc index d9dde6631f..1a4ab78f53 100644 --- a/talk/examples/relayserver/relayserver_main.cc +++ b/talk/examples/relayserver/relayserver_main.cc @@ -27,9 +27,9 @@ #include // NOLINT -#include "webrtc/base/thread.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/p2p/base/relayserver.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread.h" int main(int argc, char **argv) { if (argc != 3) { diff --git a/talk/examples/stunserver/stunserver_main.cc b/talk/examples/stunserver/stunserver_main.cc index 3ac2ea691f..f800f316ec 100644 --- a/talk/examples/stunserver/stunserver_main.cc +++ b/talk/examples/stunserver/stunserver_main.cc @@ -31,8 +31,8 @@ #include -#include "webrtc/base/thread.h" #include "talk/p2p/base/stunserver.h" +#include "webrtc/base/thread.h" using namespace cricket; diff --git a/talk/examples/turnserver/turnserver_main.cc b/talk/examples/turnserver/turnserver_main.cc index a32f42c370..607b8cf733 100644 --- a/talk/examples/turnserver/turnserver_main.cc +++ b/talk/examples/turnserver/turnserver_main.cc @@ -27,12 +27,12 @@ #include // NOLINT -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/optionsfile.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/stringencode.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/turnserver.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/optionsfile.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/thread.h" static const char kSoftware[] = "libjingle TurnServer"; diff --git a/talk/media/base/capturemanager.cc b/talk/media/base/capturemanager.cc index e6fb9f0b17..06f4b83b93 100644 --- a/talk/media/base/capturemanager.cc +++ b/talk/media/base/capturemanager.cc @@ -29,10 +29,10 @@ #include -#include "webrtc/base/logging.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videoprocessor.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/media/base/capturemanager.h b/talk/media/base/capturemanager.h index 211516d93a..16e80918ee 100644 --- a/talk/media/base/capturemanager.h +++ b/talk/media/base/capturemanager.h @@ -46,9 +46,9 @@ #include #include -#include "webrtc/base/sigslotrepeater.h" #include "talk/media/base/capturerenderadapter.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/sigslotrepeater.h" namespace cricket { diff --git a/talk/media/base/capturemanager_unittest.cc b/talk/media/base/capturemanager_unittest.cc index cff9caecde..1bdf0f88e8 100644 --- a/talk/media/base/capturemanager_unittest.cc +++ b/talk/media/base/capturemanager_unittest.cc @@ -27,11 +27,11 @@ #include "talk/media/base/capturemanager.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/media/base/fakemediaprocessor.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/fakevideorenderer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" const int kMsCallbackWait = 50; diff --git a/talk/media/base/capturerenderadapter.cc b/talk/media/base/capturerenderadapter.cc index 010cc061b1..826909d7d2 100644 --- a/talk/media/base/capturerenderadapter.cc +++ b/talk/media/base/capturerenderadapter.cc @@ -27,10 +27,10 @@ #include "talk/media/base/capturerenderadapter.h" -#include "webrtc/base/logging.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videoprocessor.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/media/base/capturerenderadapter.h b/talk/media/base/capturerenderadapter.h index 73260a55fd..0b1ed97962 100644 --- a/talk/media/base/capturerenderadapter.h +++ b/talk/media/base/capturerenderadapter.h @@ -36,9 +36,9 @@ #include +#include "talk/media/base/videocapturer.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/sigslot.h" -#include "talk/media/base/videocapturer.h" namespace cricket { diff --git a/talk/media/base/codec_unittest.cc b/talk/media/base/codec_unittest.cc index 8ead5ee643..7bd3735a9b 100644 --- a/talk/media/base/codec_unittest.cc +++ b/talk/media/base/codec_unittest.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/codec.h" +#include "webrtc/base/gunit.h" using cricket::AudioCodec; using cricket::Codec; diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h index 6fc6a348fc..7bc395844c 100644 --- a/talk/media/base/fakemediaengine.h +++ b/talk/media/base/fakemediaengine.h @@ -34,13 +34,13 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/audiorenderer.h" #include "talk/media/base/mediaengine.h" #include "talk/media/base/rtputils.h" #include "talk/media/base/streamparams.h" #include "talk/p2p/base/sessiondescription.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/stringutils.h" namespace cricket { diff --git a/talk/media/base/fakenetworkinterface.h b/talk/media/base/fakenetworkinterface.h index e4878e7d64..3a9d1359b9 100644 --- a/talk/media/base/fakenetworkinterface.h +++ b/talk/media/base/fakenetworkinterface.h @@ -28,9 +28,11 @@ #ifndef TALK_MEDIA_BASE_FAKENETWORKINTERFACE_H_ #define TALK_MEDIA_BASE_FAKENETWORKINTERFACE_H_ -#include #include +#include +#include "talk/media/base/mediachannel.h" +#include "talk/media/base/rtputils.h" #include "webrtc/base/buffer.h" #include "webrtc/base/byteorder.h" #include "webrtc/base/criticalsection.h" @@ -38,8 +40,6 @@ #include "webrtc/base/messagehandler.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/thread.h" -#include "talk/media/base/mediachannel.h" -#include "talk/media/base/rtputils.h" namespace cricket { diff --git a/talk/media/base/fakevideocapturer.h b/talk/media/base/fakevideocapturer.h index b61ac5dd7c..e8d49c0e83 100644 --- a/talk/media/base/fakevideocapturer.h +++ b/talk/media/base/fakevideocapturer.h @@ -32,10 +32,10 @@ #include -#include "webrtc/base/timeutils.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/timeutils.h" #ifdef HAVE_WEBRTC_VIDEO #include "talk/media/webrtc/webrtcvideoframefactory.h" #endif diff --git a/talk/media/base/fakevideorenderer.h b/talk/media/base/fakevideorenderer.h index f32fad553b..9ceaac8b1f 100644 --- a/talk/media/base/fakevideorenderer.h +++ b/talk/media/base/fakevideorenderer.h @@ -28,10 +28,10 @@ #ifndef TALK_MEDIA_BASE_FAKEVIDEORENDERER_H_ #define TALK_MEDIA_BASE_FAKEVIDEORENDERER_H_ -#include "webrtc/base/logging.h" -#include "webrtc/base/sigslot.h" #include "talk/media/base/videoframe.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/sigslot.h" namespace cricket { diff --git a/talk/media/base/filemediaengine.cc b/talk/media/base/filemediaengine.cc index 08cea239a4..460b2050a8 100644 --- a/talk/media/base/filemediaengine.cc +++ b/talk/media/base/filemediaengine.cc @@ -27,14 +27,14 @@ #include +#include "talk/media/base/rtpdump.h" +#include "talk/media/base/rtputils.h" +#include "talk/media/base/streamparams.h" #include "webrtc/base/buffer.h" #include "webrtc/base/event.h" #include "webrtc/base/logging.h" #include "webrtc/base/pathutils.h" #include "webrtc/base/stream.h" -#include "talk/media/base/rtpdump.h" -#include "talk/media/base/rtputils.h" -#include "talk/media/base/streamparams.h" namespace cricket { diff --git a/talk/media/base/filemediaengine.h b/talk/media/base/filemediaengine.h index 47802ca883..e546328e7e 100644 --- a/talk/media/base/filemediaengine.h +++ b/talk/media/base/filemediaengine.h @@ -29,11 +29,11 @@ #include #include -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stream.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stream.h" namespace rtc { class StreamInterface; diff --git a/talk/media/base/filemediaengine_unittest.cc b/talk/media/base/filemediaengine_unittest.cc index 00be12877e..1f7405df2c 100644 --- a/talk/media/base/filemediaengine_unittest.cc +++ b/talk/media/base/filemediaengine_unittest.cc @@ -27,15 +27,15 @@ #include +#include "talk/media/base/filemediaengine.h" +#include "talk/media/base/rtpdump.h" +#include "talk/media/base/streamparams.h" +#include "talk/media/base/testutils.h" #include "webrtc/base/buffer.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/pathutils.h" #include "webrtc/base/stream.h" -#include "talk/media/base/filemediaengine.h" -#include "talk/media/base/rtpdump.h" -#include "talk/media/base/streamparams.h" -#include "talk/media/base/testutils.h" namespace cricket { diff --git a/talk/media/base/hybriddataengine.h b/talk/media/base/hybriddataengine.h index 1d5b8b835d..3e7d84c945 100644 --- a/talk/media/base/hybriddataengine.h +++ b/talk/media/base/hybriddataengine.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/scoped_ptr.h" namespace cricket { diff --git a/talk/media/base/hybridvideoengine.h b/talk/media/base/hybridvideoengine.h index 4d819c7ca5..004d3cfcbe 100644 --- a/talk/media/base/hybridvideoengine.h +++ b/talk/media/base/hybridvideoengine.h @@ -31,12 +31,12 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/sigslotrepeater.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/sigslotrepeater.h" namespace cricket { diff --git a/talk/media/base/hybridvideoengine_unittest.cc b/talk/media/base/hybridvideoengine_unittest.cc index df7e1fa10c..7b409ead2e 100644 --- a/talk/media/base/hybridvideoengine_unittest.cc +++ b/talk/media/base/hybridvideoengine_unittest.cc @@ -25,13 +25,13 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/fakenetworkinterface.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/hybridvideoengine.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/testutils.h" +#include "webrtc/base/gunit.h" static const cricket::VideoCodec kGenericCodec(97, "Generic", 640, 360, 30, 0); static const cricket::VideoCodec kVp8Codec(100, "VP8", 640, 360, 30, 0); diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h index c45ae2972f..3759acce39 100644 --- a/talk/media/base/mediachannel.h +++ b/talk/media/base/mediachannel.h @@ -31,6 +31,9 @@ #include #include +#include "talk/media/base/codec.h" +#include "talk/media/base/constants.h" +#include "talk/media/base/streamparams.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/buffer.h" #include "webrtc/base/dscp.h" @@ -38,9 +41,6 @@ #include "webrtc/base/sigslot.h" #include "webrtc/base/socket.h" #include "webrtc/base/window.h" -#include "talk/media/base/codec.h" -#include "talk/media/base/constants.h" -#include "talk/media/base/streamparams.h" // TODO(juberti): re-evaluate this include #include "talk/session/media/audiomonitor.h" diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h index 23804307c6..6c4b74094f 100644 --- a/talk/media/base/mediaengine.h +++ b/talk/media/base/mediaengine.h @@ -37,8 +37,6 @@ #include #include -#include "webrtc/base/fileutils.h" -#include "webrtc/base/sigslotrepeater.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediacommon.h" @@ -47,6 +45,8 @@ #include "talk/media/base/videoprocessor.h" #include "talk/media/base/voiceprocessor.h" #include "talk/media/devices/devicemanager.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/sigslotrepeater.h" #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) #define DISABLE_MEDIA_ENGINE_FACTORY diff --git a/talk/media/base/rtpdataengine.cc b/talk/media/base/rtpdataengine.cc index 4505911268..0acc43a8f8 100644 --- a/talk/media/base/rtpdataengine.cc +++ b/talk/media/base/rtpdataengine.cc @@ -27,15 +27,15 @@ #include "talk/media/base/rtpdataengine.h" +#include "talk/media/base/codec.h" +#include "talk/media/base/constants.h" +#include "talk/media/base/rtputils.h" +#include "talk/media/base/streamparams.h" #include "webrtc/base/buffer.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/ratelimiter.h" #include "webrtc/base/timing.h" -#include "talk/media/base/codec.h" -#include "talk/media/base/constants.h" -#include "talk/media/base/rtputils.h" -#include "talk/media/base/streamparams.h" namespace cricket { diff --git a/talk/media/base/rtpdataengine.h b/talk/media/base/rtpdataengine.h index 6dc578806d..787ba26543 100644 --- a/talk/media/base/rtpdataengine.h +++ b/talk/media/base/rtpdataengine.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/timing.h" #include "talk/media/base/constants.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/timing.h" namespace cricket { diff --git a/talk/media/base/rtpdataengine_unittest.cc b/talk/media/base/rtpdataengine_unittest.cc index 034df54285..1f0a23790b 100644 --- a/talk/media/base/rtpdataengine_unittest.cc +++ b/talk/media/base/rtpdataengine_unittest.cc @@ -27,16 +27,16 @@ #include +#include "talk/media/base/constants.h" +#include "talk/media/base/fakenetworkinterface.h" +#include "talk/media/base/rtpdataengine.h" +#include "talk/media/base/rtputils.h" #include "webrtc/base/buffer.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/timing.h" -#include "talk/media/base/constants.h" -#include "talk/media/base/fakenetworkinterface.h" -#include "talk/media/base/rtpdataengine.h" -#include "talk/media/base/rtputils.h" class FakeTiming : public rtc::Timing { public: diff --git a/talk/media/base/rtpdump.cc b/talk/media/base/rtpdump.cc index 0b09b2a13f..61001a8233 100644 --- a/talk/media/base/rtpdump.cc +++ b/talk/media/base/rtpdump.cc @@ -31,10 +31,10 @@ #include +#include "talk/media/base/rtputils.h" #include "webrtc/base/byteorder.h" #include "webrtc/base/logging.h" #include "webrtc/base/timeutils.h" -#include "talk/media/base/rtputils.h" namespace { static const int kRtpSsrcOffset = 8; diff --git a/talk/media/base/rtpdump_unittest.cc b/talk/media/base/rtpdump_unittest.cc index 4e32f0abb8..acf60b919d 100644 --- a/talk/media/base/rtpdump_unittest.cc +++ b/talk/media/base/rtpdump_unittest.cc @@ -27,12 +27,12 @@ #include -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "talk/media/base/rtpdump.h" #include "talk/media/base/rtputils.h" #include "talk/media/base/testutils.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/media/base/rtputils_unittest.cc b/talk/media/base/rtputils_unittest.cc index b06f78b281..cec4f71f8d 100644 --- a/talk/media/base/rtputils_unittest.cc +++ b/talk/media/base/rtputils_unittest.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/fakertp.h" #include "talk/media/base/rtputils.h" +#include "webrtc/base/gunit.h" namespace cricket { diff --git a/talk/media/base/streamparams.h b/talk/media/base/streamparams.h index 43b599620a..e36c09419f 100644 --- a/talk/media/base/streamparams.h +++ b/talk/media/base/streamparams.h @@ -44,8 +44,8 @@ #define TALK_MEDIA_BASE_STREAMPARAMS_H_ #include -#include #include +#include #include #include "webrtc/base/basictypes.h" diff --git a/talk/media/base/streamparams_unittest.cc b/talk/media/base/streamparams_unittest.cc index 8d51d7d90a..c24403baa7 100644 --- a/talk/media/base/streamparams_unittest.cc +++ b/talk/media/base/streamparams_unittest.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/streamparams.h" #include "talk/media/base/testutils.h" +#include "webrtc/base/gunit.h" static const uint32 kSsrcs1[] = {1}; static const uint32 kSsrcs2[] = {1, 2}; diff --git a/talk/media/base/testutils.cc b/talk/media/base/testutils.cc index c06e9e17f7..8b79df4b63 100644 --- a/talk/media/base/testutils.cc +++ b/talk/media/base/testutils.cc @@ -29,6 +29,9 @@ #include +#include "talk/media/base/rtpdump.h" +#include "talk/media/base/videocapturer.h" +#include "talk/media/base/videoframe.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/fileutils.h" #include "webrtc/base/gunit.h" @@ -36,9 +39,6 @@ #include "webrtc/base/stream.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/testutils.h" -#include "talk/media/base/rtpdump.h" -#include "talk/media/base/videocapturer.h" -#include "talk/media/base/videoframe.h" namespace cricket { diff --git a/talk/media/base/testutils.h b/talk/media/base/testutils.h index 2d5f75fe2b..f5a460f0c8 100644 --- a/talk/media/base/testutils.h +++ b/talk/media/base/testutils.h @@ -34,12 +34,12 @@ #if !defined(DISABLE_YUV) #include "libyuv/compare.h" #endif -#include "webrtc/base/basictypes.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/window.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/window.h" namespace rtc { class ByteBuffer; diff --git a/talk/media/base/videoadapter.cc b/talk/media/base/videoadapter.cc index 4b550d2050..f8dcd38ab4 100644 --- a/talk/media/base/videoadapter.cc +++ b/talk/media/base/videoadapter.cc @@ -27,11 +27,11 @@ #include // For INT_MAX -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "talk/media/base/constants.h" #include "talk/media/base/videocommon.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/timeutils.h" namespace cricket { diff --git a/talk/media/base/videoadapter.h b/talk/media/base/videoadapter.h index 50b4a13a71..0a9e27e408 100644 --- a/talk/media/base/videoadapter.h +++ b/talk/media/base/videoadapter.h @@ -26,11 +26,11 @@ #ifndef TALK_MEDIA_BASE_VIDEOADAPTER_H_ // NOLINT #define TALK_MEDIA_BASE_VIDEOADAPTER_H_ +#include "talk/media/base/videocommon.h" #include "webrtc/base/common.h" // For ASSERT #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslot.h" -#include "talk/media/base/videocommon.h" namespace cricket { diff --git a/talk/media/base/videoadapter_unittest.cc b/talk/media/base/videoadapter_unittest.cc index df4125d8c6..af374e07c6 100755 --- a/talk/media/base/videoadapter_unittest.cc +++ b/talk/media/base/videoadapter_unittest.cc @@ -31,14 +31,14 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/sigslot.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/testutils.h" #include "talk/media/base/videoadapter.h" #include "talk/media/devices/filevideocapturer.h" #include "talk/media/webrtc/webrtcvideoframe.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/sigslot.h" namespace cricket { diff --git a/talk/media/base/videocapturer.cc b/talk/media/base/videocapturer.cc index f20e6fb762..85c27f291d 100644 --- a/talk/media/base/videocapturer.cc +++ b/talk/media/base/videocapturer.cc @@ -32,11 +32,11 @@ #if !defined(DISABLE_YUV) #include "libyuv/scale_argb.h" #endif +#include "talk/media/base/videoframefactory.h" +#include "talk/media/base/videoprocessor.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/base/systeminfo.h" -#include "talk/media/base/videoframefactory.h" -#include "talk/media/base/videoprocessor.h" #if defined(HAVE_WEBRTC_VIDEO) #include "talk/media/webrtc/webrtcvideoframe.h" diff --git a/talk/media/base/videocapturer.h b/talk/media/base/videocapturer.h index c60221a55b..45b64ea726 100644 --- a/talk/media/base/videocapturer.h +++ b/talk/media/base/videocapturer.h @@ -31,6 +31,11 @@ #include #include +#include "talk/media/base/mediachannel.h" +#include "talk/media/base/videoadapter.h" +#include "talk/media/base/videocommon.h" +#include "talk/media/base/videoframefactory.h" +#include "talk/media/devices/devicemanager.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/messagehandler.h" @@ -39,11 +44,6 @@ #include "webrtc/base/sigslot.h" #include "webrtc/base/thread.h" #include "webrtc/base/timing.h" -#include "talk/media/base/mediachannel.h" -#include "talk/media/base/videoadapter.h" -#include "talk/media/base/videocommon.h" -#include "talk/media/base/videoframefactory.h" -#include "talk/media/devices/devicemanager.h" namespace cricket { diff --git a/talk/media/base/videocapturer_unittest.cc b/talk/media/base/videocapturer_unittest.cc index 37f6bbde47..1760d8a848 100644 --- a/talk/media/base/videocapturer_unittest.cc +++ b/talk/media/base/videocapturer_unittest.cc @@ -28,15 +28,15 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" #include "talk/media/base/fakemediaprocessor.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/fakevideorenderer.h" #include "talk/media/base/testutils.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videoprocessor.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/thread.h" using cricket::FakeVideoCapturer; diff --git a/talk/media/base/videocommon_unittest.cc b/talk/media/base/videocommon_unittest.cc index a30a2c9527..daa9881e00 100644 --- a/talk/media/base/videocommon_unittest.cc +++ b/talk/media/base/videocommon_unittest.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/gunit.h" namespace cricket { diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h index 40881ebd22..dc22122d4c 100644 --- a/talk/media/base/videoengine_unittest.h +++ b/talk/media/base/videoengine_unittest.h @@ -29,14 +29,14 @@ #include #include -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/timeutils.h" #include "talk/media/base/fakenetworkinterface.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/fakevideorenderer.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/streamparams.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/timeutils.h" #ifdef WIN32 #include // NOLINT diff --git a/talk/media/base/videoframe.cc b/talk/media/base/videoframe.cc index d84169324f..1c5cfd8305 100644 --- a/talk/media/base/videoframe.cc +++ b/talk/media/base/videoframe.cc @@ -35,8 +35,8 @@ #include "libyuv/scale.h" #endif -#include "webrtc/base/logging.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/media/base/videoframe_unittest.h b/talk/media/base/videoframe_unittest.h index 120f0e279e..c4a7a8cc06 100644 --- a/talk/media/base/videoframe_unittest.h +++ b/talk/media/base/videoframe_unittest.h @@ -35,13 +35,13 @@ #include "libyuv/format_conversion.h" #include "libyuv/planar_functions.h" #include "libyuv/rotate.h" +#include "talk/media/base/testutils.h" +#include "talk/media/base/videocommon.h" +#include "talk/media/base/videoframe.h" #include "webrtc/base/gunit.h" #include "webrtc/base/pathutils.h" #include "webrtc/base/stream.h" #include "webrtc/base/stringutils.h" -#include "talk/media/base/testutils.h" -#include "talk/media/base/videocommon.h" -#include "talk/media/base/videoframe.h" #if defined(_MSC_VER) #define ALIGN16(var) __declspec(align(16)) var diff --git a/talk/media/base/videoprocessor.h b/talk/media/base/videoprocessor.h index 78a3bf8633..da8020e95d 100755 --- a/talk/media/base/videoprocessor.h +++ b/talk/media/base/videoprocessor.h @@ -28,8 +28,8 @@ #ifndef TALK_MEDIA_BASE_VIDEOPROCESSOR_H_ #define TALK_MEDIA_BASE_VIDEOPROCESSOR_H_ -#include "webrtc/base/sigslot.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/sigslot.h" namespace cricket { diff --git a/talk/media/base/voiceprocessor.h b/talk/media/base/voiceprocessor.h index 90dfc2724f..c2c33879c8 100755 --- a/talk/media/base/voiceprocessor.h +++ b/talk/media/base/voiceprocessor.h @@ -28,9 +28,9 @@ #ifndef TALK_MEDIA_BASE_VOICEPROCESSOR_H_ #define TALK_MEDIA_BASE_VOICEPROCESSOR_H_ +#include "talk/media/base/audioframe.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/sigslot.h" -#include "talk/media/base/audioframe.h" namespace cricket { diff --git a/talk/media/devices/carbonvideorenderer.cc b/talk/media/devices/carbonvideorenderer.cc index a0b4870450..29a51f30c9 100644 --- a/talk/media/devices/carbonvideorenderer.cc +++ b/talk/media/devices/carbonvideorenderer.cc @@ -27,9 +27,9 @@ #include "talk/media/devices/carbonvideorenderer.h" -#include "webrtc/base/logging.h" #include "talk/media/base/videocommon.h" #include "talk/media/base/videoframe.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/media/devices/carbonvideorenderer.h b/talk/media/devices/carbonvideorenderer.h index 5cfc9ae356..4a5989eac2 100644 --- a/talk/media/devices/carbonvideorenderer.h +++ b/talk/media/devices/carbonvideorenderer.h @@ -31,9 +31,9 @@ #include +#include "talk/media/base/videorenderer.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/media/base/videorenderer.h" namespace cricket { diff --git a/talk/media/devices/devicemanager.cc b/talk/media/devices/devicemanager.cc index 9d7a951e55..04ea82f42f 100644 --- a/talk/media/devices/devicemanager.cc +++ b/talk/media/devices/devicemanager.cc @@ -27,6 +27,11 @@ #include "talk/media/devices/devicemanager.h" +#include "talk/media/base/mediacommon.h" +#include "talk/media/base/videocapturerfactory.h" +#include "talk/media/devices/deviceinfo.h" +#include "talk/media/devices/filevideocapturer.h" +#include "talk/media/devices/yuvframescapturer.h" #include "webrtc/base/fileutils.h" #include "webrtc/base/logging.h" #include "webrtc/base/pathutils.h" @@ -34,11 +39,6 @@ #include "webrtc/base/thread.h" #include "webrtc/base/windowpicker.h" #include "webrtc/base/windowpickerfactory.h" -#include "talk/media/base/mediacommon.h" -#include "talk/media/base/videocapturerfactory.h" -#include "talk/media/devices/deviceinfo.h" -#include "talk/media/devices/filevideocapturer.h" -#include "talk/media/devices/yuvframescapturer.h" #ifdef HAVE_WEBRTC_VIDEO #include "talk/media/webrtc/webrtcvideocapturerfactory.h" diff --git a/talk/media/devices/devicemanager.h b/talk/media/devices/devicemanager.h index 74ceb381f8..982c679531 100644 --- a/talk/media/devices/devicemanager.h +++ b/talk/media/devices/devicemanager.h @@ -34,8 +34,8 @@ #include "talk/media/base/device.h" #include "talk/media/base/screencastid.h" -#include "talk/media/base/videocommon.h" #include "talk/media/base/videocapturerfactory.h" +#include "talk/media/base/videocommon.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/stringencode.h" diff --git a/talk/media/devices/devicemanager_unittest.cc b/talk/media/devices/devicemanager_unittest.cc index 19aaa90484..f259c7d0d3 100644 --- a/talk/media/devices/devicemanager_unittest.cc +++ b/talk/media/devices/devicemanager_unittest.cc @@ -28,8 +28,8 @@ #include "talk/media/devices/devicemanager.h" #ifdef WIN32 -#include "webrtc/base/win32.h" #include +#include "webrtc/base/win32.h" #endif #include diff --git a/talk/media/devices/dummydevicemanager_unittest.cc b/talk/media/devices/dummydevicemanager_unittest.cc index 86b5352fa0..9f4eb41b53 100644 --- a/talk/media/devices/dummydevicemanager_unittest.cc +++ b/talk/media/devices/dummydevicemanager_unittest.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/devices/dummydevicemanager.h" +#include "webrtc/base/gunit.h" using cricket::Device; using cricket::DummyDeviceManager; diff --git a/talk/media/devices/filevideocapturer.h b/talk/media/devices/filevideocapturer.h index e6bd9b47fd..2b81aa9a75 100644 --- a/talk/media/devices/filevideocapturer.h +++ b/talk/media/devices/filevideocapturer.h @@ -37,9 +37,9 @@ #include #include +#include "talk/media/base/videocapturer.h" #include "webrtc/base/stream.h" #include "webrtc/base/stringutils.h" -#include "talk/media/base/videocapturer.h" namespace rtc { class FileStream; diff --git a/talk/media/devices/filevideocapturer_unittest.cc b/talk/media/devices/filevideocapturer_unittest.cc index be416c0f04..7bc873c198 100644 --- a/talk/media/devices/filevideocapturer_unittest.cc +++ b/talk/media/devices/filevideocapturer_unittest.cc @@ -30,11 +30,11 @@ #include #include +#include "talk/media/base/testutils.h" +#include "talk/media/devices/filevideocapturer.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" -#include "talk/media/base/testutils.h" -#include "talk/media/devices/filevideocapturer.h" namespace { diff --git a/talk/media/devices/gdivideorenderer.cc b/talk/media/devices/gdivideorenderer.cc index 3d01b9a1cd..b38da19f7e 100755 --- a/talk/media/devices/gdivideorenderer.cc +++ b/talk/media/devices/gdivideorenderer.cc @@ -29,11 +29,11 @@ #include "talk/media/devices/gdivideorenderer.h" +#include "talk/media/base/videocommon.h" +#include "talk/media/base/videoframe.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" #include "webrtc/base/win32window.h" -#include "talk/media/base/videocommon.h" -#include "talk/media/base/videoframe.h" namespace cricket { diff --git a/talk/media/devices/gdivideorenderer.h b/talk/media/devices/gdivideorenderer.h index fc817c9456..5124cdf436 100755 --- a/talk/media/devices/gdivideorenderer.h +++ b/talk/media/devices/gdivideorenderer.h @@ -30,8 +30,8 @@ #define TALK_MEDIA_DEVICES_GDIVIDEORENDERER_H_ #ifdef WIN32 -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/scoped_ptr.h" namespace cricket { diff --git a/talk/media/devices/gtkvideorenderer.cc b/talk/media/devices/gtkvideorenderer.cc index a926879be3..49c700935f 100755 --- a/talk/media/devices/gtkvideorenderer.cc +++ b/talk/media/devices/gtkvideorenderer.cc @@ -27,8 +27,8 @@ #include "talk/media/devices/gtkvideorenderer.h" -#include #include +#include #include #include "talk/media/base/videocommon.h" diff --git a/talk/media/devices/gtkvideorenderer.h b/talk/media/devices/gtkvideorenderer.h index a6a3def3f1..4d7243f460 100755 --- a/talk/media/devices/gtkvideorenderer.h +++ b/talk/media/devices/gtkvideorenderer.h @@ -29,9 +29,9 @@ #ifndef TALK_MEDIA_DEVICES_GTKVIDEORENDERER_H_ #define TALK_MEDIA_DEVICES_GTKVIDEORENDERER_H_ +#include "talk/media/base/videorenderer.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/media/base/videorenderer.h" typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h diff --git a/talk/media/devices/linuxdeviceinfo.cc b/talk/media/devices/linuxdeviceinfo.cc index 2aef463166..0b22e15a99 100644 --- a/talk/media/devices/linuxdeviceinfo.cc +++ b/talk/media/devices/linuxdeviceinfo.cc @@ -27,8 +27,8 @@ #include "talk/media/devices/deviceinfo.h" -#include "webrtc/base/common.h" // for ASSERT #include "talk/media/devices/libudevsymboltable.h" +#include "webrtc/base/common.h" // for ASSERT namespace cricket { diff --git a/talk/media/devices/linuxdevicemanager.cc b/talk/media/devices/linuxdevicemanager.cc index 53eed80d64..a79e226f8e 100644 --- a/talk/media/devices/linuxdevicemanager.cc +++ b/talk/media/devices/linuxdevicemanager.cc @@ -28,6 +28,13 @@ #include "talk/media/devices/linuxdevicemanager.h" #include +#include "talk/media/base/mediacommon.h" +#include "talk/media/devices/libudevsymboltable.h" +#include "talk/media/devices/v4llookup.h" +#include "talk/sound/platformsoundsystem.h" +#include "talk/sound/platformsoundsystemfactory.h" +#include "talk/sound/sounddevicelocator.h" +#include "talk/sound/soundsysteminterface.h" #include "webrtc/base/fileutils.h" #include "webrtc/base/linux.h" #include "webrtc/base/logging.h" @@ -36,13 +43,6 @@ #include "webrtc/base/stream.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" -#include "talk/media/base/mediacommon.h" -#include "talk/media/devices/libudevsymboltable.h" -#include "talk/media/devices/v4llookup.h" -#include "talk/sound/platformsoundsystem.h" -#include "talk/sound/platformsoundsystemfactory.h" -#include "talk/sound/sounddevicelocator.h" -#include "talk/sound/soundsysteminterface.h" namespace cricket { diff --git a/talk/media/devices/linuxdevicemanager.h b/talk/media/devices/linuxdevicemanager.h index 651dd6ff6f..88aee4e457 100644 --- a/talk/media/devices/linuxdevicemanager.h +++ b/talk/media/devices/linuxdevicemanager.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/sigslot.h" -#include "webrtc/base/stringencode.h" #include "talk/media/devices/devicemanager.h" #include "talk/sound/soundsystemfactory.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/stringencode.h" namespace cricket { diff --git a/talk/media/devices/macdevicemanager.cc b/talk/media/devices/macdevicemanager.cc index fa25b1f18f..568ee53f6b 100644 --- a/talk/media/devices/macdevicemanager.cc +++ b/talk/media/devices/macdevicemanager.cc @@ -30,10 +30,10 @@ #include #include +#include "talk/media/base/mediacommon.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" -#include "talk/media/base/mediacommon.h" class DeviceWatcherImpl; diff --git a/talk/media/devices/macdevicemanager.h b/talk/media/devices/macdevicemanager.h index 161e308d97..82e62f9698 100644 --- a/talk/media/devices/macdevicemanager.h +++ b/talk/media/devices/macdevicemanager.h @@ -31,9 +31,9 @@ #include #include +#include "talk/media/devices/devicemanager.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/stringencode.h" -#include "talk/media/devices/devicemanager.h" namespace cricket { diff --git a/talk/media/devices/v4llookup.cc b/talk/media/devices/v4llookup.cc index 8b44a807af..5e9ce0230c 100644 --- a/talk/media/devices/v4llookup.cc +++ b/talk/media/devices/v4llookup.cc @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include #include #include "webrtc/base/logging.h" diff --git a/talk/media/devices/win32devicemanager.h b/talk/media/devices/win32devicemanager.h index d93159013e..5f8ba8333a 100644 --- a/talk/media/devices/win32devicemanager.h +++ b/talk/media/devices/win32devicemanager.h @@ -31,9 +31,9 @@ #include #include +#include "talk/media/devices/devicemanager.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/stringencode.h" -#include "talk/media/devices/devicemanager.h" namespace cricket { diff --git a/talk/media/devices/yuvframescapturer.h b/talk/media/devices/yuvframescapturer.h index 52eec589f3..64c17323cd 100644 --- a/talk/media/devices/yuvframescapturer.h +++ b/talk/media/devices/yuvframescapturer.h @@ -4,10 +4,10 @@ #include #include -#include "webrtc/base/stream.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/yuvframegenerator.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/stringutils.h" namespace rtc { diff --git a/talk/media/other/linphonemediaengine.cc b/talk/media/other/linphonemediaengine.cc index fabb31654d..06b6d76f12 100644 --- a/talk/media/other/linphonemediaengine.cc +++ b/talk/media/other/linphonemediaengine.cc @@ -32,18 +32,18 @@ // LinphoneMediaEngine is a Linphone implementation of MediaEngine extern "C" { #include -#include #include +#include } #include "talk/media/other/linphonemediaengine.h" +#include "talk/media/base/rtpdump.h" #include "webrtc/base/buffer.h" #include "webrtc/base/event.h" #include "webrtc/base/logging.h" #include "webrtc/base/pathutils.h" #include "webrtc/base/stream.h" -#include "talk/media/base/rtpdump.h" #ifndef WIN32 #include diff --git a/talk/media/other/linphonemediaengine.h b/talk/media/other/linphonemediaengine.h index 7c49c167d6..e4ba3453a2 100644 --- a/talk/media/other/linphonemediaengine.h +++ b/talk/media/other/linphonemediaengine.h @@ -37,10 +37,10 @@ extern "C" { #include } -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/scoped_ptr.h" namespace rtc { class StreamInterface; diff --git a/talk/media/sctp/sctpdataengine.cc b/talk/media/sctp/sctpdataengine.cc index 8b74680fe8..88dade79f4 100644 --- a/talk/media/sctp/sctpdataengine.cc +++ b/talk/media/sctp/sctpdataengine.cc @@ -32,14 +32,14 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" #include "talk/media/base/codec.h" #include "talk/media/base/constants.h" #include "talk/media/base/streamparams.h" #include "usrsctplib/usrsctp.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/safe_conversions.h" namespace { typedef cricket::SctpDataMediaChannel::StreamSet StreamSet; diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h index 179505902c..4e36d6517f 100644 --- a/talk/media/sctp/sctpdataengine.h +++ b/talk/media/sctp/sctpdataengine.h @@ -41,11 +41,11 @@ enum PreservedErrno { }; } // namespace cricket -#include "webrtc/base/buffer.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/codec.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/scoped_ptr.h" // Defined by "usrsctplib/usrsctp.h" struct sockaddr_conn; diff --git a/talk/media/sctp/sctpdataengine_unittest.cc b/talk/media/sctp/sctpdataengine_unittest.cc index a656603cea..0fb9b9d092 100644 --- a/talk/media/sctp/sctpdataengine_unittest.cc +++ b/talk/media/sctp/sctpdataengine_unittest.cc @@ -31,6 +31,9 @@ #include #include +#include "talk/media/base/constants.h" +#include "talk/media/base/mediachannel.h" +#include "talk/media/sctp/sctpdataengine.h" #include "webrtc/base/bind.h" #include "webrtc/base/buffer.h" #include "webrtc/base/criticalsection.h" @@ -41,9 +44,6 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/thread.h" -#include "talk/media/base/constants.h" -#include "talk/media/base/mediachannel.h" -#include "talk/media/sctp/sctpdataengine.h" enum { MSG_PACKET = 1, diff --git a/talk/media/webrtc/fakewebrtcdeviceinfo.h b/talk/media/webrtc/fakewebrtcdeviceinfo.h index 2d015de456..874369b4b4 100644 --- a/talk/media/webrtc/fakewebrtcdeviceinfo.h +++ b/talk/media/webrtc/fakewebrtcdeviceinfo.h @@ -28,8 +28,8 @@ #include -#include "webrtc/base/stringutils.h" #include "talk/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/base/stringutils.h" // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo. class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { diff --git a/talk/media/webrtc/fakewebrtcvideoengine.h b/talk/media/webrtc/fakewebrtcvideoengine.h index da5cd893b8..3a9e4116df 100644 --- a/talk/media/webrtc/fakewebrtcvideoengine.h +++ b/talk/media/webrtc/fakewebrtcvideoengine.h @@ -32,14 +32,14 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/codec.h" #include "talk/media/webrtc/fakewebrtccommon.h" #include "talk/media/webrtc/webrtcvideodecoderfactory.h" #include "talk/media/webrtc/webrtcvideoencoderfactory.h" #include "talk/media/webrtc/webrtcvie.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringutils.h" namespace cricket { diff --git a/talk/media/webrtc/fakewebrtcvoiceengine.h b/talk/media/webrtc/fakewebrtcvoiceengine.h index d95acb7b63..f731b8dc98 100644 --- a/talk/media/webrtc/fakewebrtcvoiceengine.h +++ b/talk/media/webrtc/fakewebrtcvoiceengine.h @@ -32,14 +32,14 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/codec.h" #include "talk/media/base/rtputils.h" #include "talk/media/base/voiceprocessor.h" #include "talk/media/webrtc/fakewebrtccommon.h" #include "talk/media/webrtc/webrtcvoe.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringutils.h" #ifdef USE_WEBRTC_DEV_BRANCH #include "webrtc/modules/audio_processing/include/audio_processing.h" #endif diff --git a/talk/media/webrtc/webrtcpassthroughrender_unittest.cc b/talk/media/webrtc/webrtcpassthroughrender_unittest.cc index 542916183f..ce45c04638 100644 --- a/talk/media/webrtc/webrtcpassthroughrender_unittest.cc +++ b/talk/media/webrtc/webrtcpassthroughrender_unittest.cc @@ -4,9 +4,9 @@ #include -#include "webrtc/base/gunit.h" #include "talk/media/base/testutils.h" #include "talk/media/webrtc/webrtcpassthroughrender.h" +#include "webrtc/base/gunit.h" class WebRtcPassthroughRenderTest : public testing::Test { public: diff --git a/talk/media/webrtc/webrtctexturevideoframe.h b/talk/media/webrtc/webrtctexturevideoframe.h index 76c25eeb0d..cd4d47b282 100644 --- a/talk/media/webrtc/webrtctexturevideoframe.h +++ b/talk/media/webrtc/webrtctexturevideoframe.h @@ -28,9 +28,9 @@ #ifndef TALK_MEDIA_WEBRTC_WEBRTCTEXTUREVIDEOFRAME_H_ #define TALK_MEDIA_WEBRTC_WEBRTCTEXTUREVIDEOFRAME_H_ +#include "talk/media/base/videoframe.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ref_ptr.h" -#include "talk/media/base/videoframe.h" #include "webrtc/common_video/interface/native_handle.h" namespace cricket { diff --git a/talk/media/webrtc/webrtctexturevideoframe_unittest.cc b/talk/media/webrtc/webrtctexturevideoframe_unittest.cc index 8f5561a4a5..2aa481845c 100644 --- a/talk/media/webrtc/webrtctexturevideoframe_unittest.cc +++ b/talk/media/webrtc/webrtctexturevideoframe_unittest.cc @@ -27,8 +27,8 @@ #include "talk/media/webrtc/webrtctexturevideoframe.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/gunit.h" class NativeHandleImpl : public webrtc::NativeHandle { public: diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index 38df9cebca..ea8b61a1b9 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -32,12 +32,12 @@ #endif #ifdef HAVE_WEBRTC_VIDEO +#include "talk/media/webrtc/webrtcvideoframe.h" +#include "talk/media/webrtc/webrtcvideoframefactory.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "talk/media/webrtc/webrtcvideoframe.h" -#include "talk/media/webrtc/webrtcvideoframefactory.h" #include "webrtc/base/win32.h" // Need this to #include the impl files. #include "webrtc/modules/video_capture/include/video_capture_factory.h" diff --git a/talk/media/webrtc/webrtcvideocapturer.h b/talk/media/webrtc/webrtcvideocapturer.h index ef84fe5d5c..39a71f81c7 100644 --- a/talk/media/webrtc/webrtcvideocapturer.h +++ b/talk/media/webrtc/webrtcvideocapturer.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/messagehandler.h" #include "talk/media/base/videocapturer.h" #include "talk/media/webrtc/webrtcvideoframe.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/messagehandler.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_capture/include/video_capture.h" diff --git a/talk/media/webrtc/webrtcvideocapturer_unittest.cc b/talk/media/webrtc/webrtcvideocapturer_unittest.cc index 494ec2bc02..a99b70be4e 100644 --- a/talk/media/webrtc/webrtcvideocapturer_unittest.cc +++ b/talk/media/webrtc/webrtcvideocapturer_unittest.cc @@ -25,14 +25,14 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" #include "talk/media/base/testutils.h" #include "talk/media/base/videocommon.h" #include "talk/media/webrtc/fakewebrtcvcmfactory.h" #include "talk/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" using cricket::VideoFormat; diff --git a/talk/media/webrtc/webrtcvideoencoderfactory.h b/talk/media/webrtc/webrtcvideoencoderfactory.h index 22f673945b..3f9294d979 100644 --- a/talk/media/webrtc/webrtcvideoencoderfactory.h +++ b/talk/media/webrtc/webrtcvideoencoderfactory.h @@ -28,8 +28,8 @@ #ifndef TALK_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_ #define TALK_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_ -#include "webrtc/base/refcount.h" #include "talk/media/base/codec.h" +#include "webrtc/base/refcount.h" #include "webrtc/common_types.h" namespace webrtc { diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 3e42b7c48d..6ba48a7262 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -35,15 +35,6 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/common.h" -#include "webrtc/base/cpumonitor.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" #include "talk/media/base/constants.h" #include "talk/media/base/rtputils.h" #include "talk/media/base/streamparams.h" @@ -61,6 +52,15 @@ #include "talk/media/webrtc/webrtcvie.h" #include "talk/media/webrtc/webrtcvoe.h" #include "talk/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/common.h" +#include "webrtc/base/cpumonitor.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/timeutils.h" #include "webrtc/experiments.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h index 90f8d0cc82..c31f54725f 100644 --- a/talk/media/webrtc/webrtcvideoengine.h +++ b/talk/media/webrtc/webrtcvideoengine.h @@ -31,13 +31,13 @@ #include #include -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/codec.h" #include "talk/media/base/videocommon.h" #include "talk/media/webrtc/webrtccommon.h" #include "talk/media/webrtc/webrtcexport.h" #include "talk/media/webrtc/webrtcvideoencoderfactory.h" #include "talk/session/media/channel.h" +#include "webrtc/base/scoped_ptr.h" #include "webrtc/video_engine/include/vie_base.h" #if !defined(LIBPEERCONNECTION_LIB) && \ diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 1edb1750c9..824835bae0 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -32,15 +32,15 @@ #include #include "libyuv/convert_from.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videorenderer.h" #include "talk/media/webrtc/constants.h" #include "talk/media/webrtc/webrtcvideocapturer.h" #include "talk/media/webrtc/webrtcvideoframe.h" #include "talk/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringutils.h" #include "webrtc/call.h" // TODO(pbos): Move codecs out of modules (webrtc:3070). #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index ec4ec2e5bc..c331d82072 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -29,19 +29,19 @@ #define TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ #include -#include #include +#include -#include "webrtc/base/cpumonitor.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/mediaengine.h" #include "talk/media/webrtc/webrtcvideochannelfactory.h" +#include "webrtc/base/cpumonitor.h" +#include "webrtc/base/scoped_ptr.h" #include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/transport.h" +#include "webrtc/video_receive_stream.h" #include "webrtc/video_renderer.h" #include "webrtc/video_send_stream.h" -#include "webrtc/video_receive_stream.h" namespace webrtc { class Call; diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index 5953f348d5..9c313e63b1 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/testutils.h" #include "talk/media/base/videoengine_unittest.h" +#include "talk/media/webrtc/webrtcvideochannelfactory.h" #include "talk/media/webrtc/webrtcvideoengine2.h" #include "talk/media/webrtc/webrtcvideoengine2_unittest.h" -#include "talk/media/webrtc/webrtcvideochannelfactory.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/stringutils.h" namespace { static const cricket::VideoCodec kVp8Codec720p(100, "VP8", 1280, 720, 30, 0); diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index 8533a51a31..cbf1e333ad 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -25,11 +25,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/fakecpumonitor.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stream.h" #include "talk/media/base/constants.h" #include "talk/media/base/fakemediaprocessor.h" #include "talk/media/base/fakenetworkinterface.h" @@ -41,6 +36,11 @@ #include "talk/media/webrtc/fakewebrtcvideocapturemodule.h" #include "talk/media/webrtc/fakewebrtcvideoengine.h" #include "talk/media/webrtc/fakewebrtcvoiceengine.h" +#include "webrtc/base/fakecpumonitor.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stream.h" #include "talk/media/webrtc/webrtcvideocapturer.h" #include "talk/media/webrtc/webrtcvideoengine.h" #include "talk/media/webrtc/webrtcvideoframe.h" diff --git a/talk/media/webrtc/webrtcvideoframe.cc b/talk/media/webrtc/webrtcvideoframe.cc index ff52ec6ce1..9e4ea06c89 100644 --- a/talk/media/webrtc/webrtcvideoframe.cc +++ b/talk/media/webrtc/webrtcvideoframe.cc @@ -30,9 +30,9 @@ #include "libyuv/convert.h" #include "libyuv/convert_from.h" #include "libyuv/planar_functions.h" -#include "webrtc/base/logging.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/media/webrtc/webrtcvideoframe.h b/talk/media/webrtc/webrtcvideoframe.h index faa14f78ff..c492ff1ef2 100644 --- a/talk/media/webrtc/webrtcvideoframe.h +++ b/talk/media/webrtc/webrtcvideoframe.h @@ -28,10 +28,10 @@ #ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_ #define TALK_MEDIA_WEBRTCVIDEOFRAME_H_ +#include "talk/media/base/videoframe.h" #include "webrtc/base/buffer.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ref_ptr.h" -#include "talk/media/base/videoframe.h" #include "webrtc/common_types.h" #include "webrtc/modules/interface/module_common_types.h" diff --git a/talk/media/webrtc/webrtcvideoframe_unittest.cc b/talk/media/webrtc/webrtcvideoframe_unittest.cc index 42b106ccc4..4cfe7c090b 100644 --- a/talk/media/webrtc/webrtcvideoframe_unittest.cc +++ b/talk/media/webrtc/webrtcvideoframe_unittest.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/flags.h" #include "talk/media/base/videoframe_unittest.h" #include "talk/media/webrtc/webrtcvideoframe.h" +#include "webrtc/base/flags.h" extern int FLAG_yuvconverter_repeat; // From lmivideoframe_unittest.cc. diff --git a/talk/media/webrtc/webrtcvie.h b/talk/media/webrtc/webrtcvie.h index bb1bd80e66..190ad8b26a 100644 --- a/talk/media/webrtc/webrtcvie.h +++ b/talk/media/webrtc/webrtcvie.h @@ -29,8 +29,8 @@ #ifndef TALK_MEDIA_WEBRTCVIE_H_ #define TALK_MEDIA_WEBRTCVIE_H_ -#include "webrtc/base/common.h" #include "talk/media/webrtc/webrtccommon.h" +#include "webrtc/base/common.h" #include "webrtc/common_types.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_capture/include/video_capture.h" diff --git a/talk/media/webrtc/webrtcvoe.h b/talk/media/webrtc/webrtcvoe.h index 1bb8504d3a..8624aebc80 100644 --- a/talk/media/webrtc/webrtcvoe.h +++ b/talk/media/webrtc/webrtcvoe.h @@ -29,8 +29,8 @@ #ifndef TALK_MEDIA_WEBRTCVOE_H_ #define TALK_MEDIA_WEBRTCVOE_H_ -#include "webrtc/base/common.h" #include "talk/media/webrtc/webrtccommon.h" +#include "webrtc/base/common.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_device/include/audio_device.h" diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc index 470c1ce848..81a6cdc3e3 100644 --- a/talk/media/webrtc/webrtcvoiceengine.cc +++ b/talk/media/webrtc/webrtcvoiceengine.cc @@ -38,6 +38,11 @@ #include #include +#include "talk/media/base/audiorenderer.h" +#include "talk/media/base/constants.h" +#include "talk/media/base/streamparams.h" +#include "talk/media/base/voiceprocessor.h" +#include "talk/media/webrtc/webrtcvoe.h" #include "webrtc/base/base64.h" #include "webrtc/base/byteorder.h" #include "webrtc/base/common.h" @@ -45,11 +50,6 @@ #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/stringutils.h" -#include "talk/media/base/audiorenderer.h" -#include "talk/media/base/constants.h" -#include "talk/media/base/streamparams.h" -#include "talk/media/base/voiceprocessor.h" -#include "talk/media/webrtc/webrtcvoe.h" #include "webrtc/common.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h index 38c4e18115..69705cc6ee 100644 --- a/talk/media/webrtc/webrtcvoiceengine.h +++ b/talk/media/webrtc/webrtcvoiceengine.h @@ -33,16 +33,16 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stream.h" #include "talk/media/base/rtputils.h" #include "talk/media/webrtc/webrtccommon.h" #include "talk/media/webrtc/webrtcexport.h" #include "talk/media/webrtc/webrtcvoe.h" #include "talk/session/media/channel.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stream.h" #include "webrtc/common.h" #if !defined(LIBPEERCONNECTION_LIB) && \ diff --git a/talk/p2p/base/asyncstuntcpsocket.cc b/talk/p2p/base/asyncstuntcpsocket.cc index 74288f8e0c..c1aeead26f 100644 --- a/talk/p2p/base/asyncstuntcpsocket.cc +++ b/talk/p2p/base/asyncstuntcpsocket.cc @@ -29,9 +29,9 @@ #include +#include "talk/p2p/base/stun.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/asyncstuntcpsocket_unittest.cc b/talk/p2p/base/asyncstuntcpsocket_unittest.cc index 3796c5132f..46e5d63e37 100644 --- a/talk/p2p/base/asyncstuntcpsocket_unittest.cc +++ b/talk/p2p/base/asyncstuntcpsocket_unittest.cc @@ -25,11 +25,11 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/asyncstuntcpsocket.h" #include "webrtc/base/asyncsocket.h" #include "webrtc/base/gunit.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/asyncstuntcpsocket.h" namespace cricket { diff --git a/talk/p2p/base/basicpacketsocketfactory.cc b/talk/p2p/base/basicpacketsocketfactory.cc index b3575c0f98..2b3b06f492 100644 --- a/talk/p2p/base/basicpacketsocketfactory.cc +++ b/talk/p2p/base/basicpacketsocketfactory.cc @@ -27,8 +27,10 @@ #include "talk/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/base/asyncudpsocket.h" +#include "talk/p2p/base/asyncstuntcpsocket.h" +#include "talk/p2p/base/stun.h" #include "webrtc/base/asynctcpsocket.h" +#include "webrtc/base/asyncudpsocket.h" #include "webrtc/base/logging.h" #include "webrtc/base/nethelpers.h" #include "webrtc/base/physicalsocketserver.h" @@ -36,8 +38,6 @@ #include "webrtc/base/socketadapters.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/asyncstuntcpsocket.h" -#include "talk/p2p/base/stun.h" namespace rtc { diff --git a/talk/p2p/base/candidate.h b/talk/p2p/base/candidate.h index 9c1198d0c0..cb0b1bcfd5 100644 --- a/talk/p2p/base/candidate.h +++ b/talk/p2p/base/candidate.h @@ -31,13 +31,13 @@ #include #include -#include -#include #include +#include +#include +#include "talk/p2p/base/constants.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/socketaddress.h" -#include "talk/p2p/base/constants.h" namespace cricket { diff --git a/talk/p2p/base/dtlstransportchannel.cc b/talk/p2p/base/dtlstransportchannel.cc index 85da4a9144..c41d38388e 100644 --- a/talk/p2p/base/dtlstransportchannel.cc +++ b/talk/p2p/base/dtlstransportchannel.cc @@ -28,13 +28,13 @@ #include "talk/p2p/base/dtlstransportchannel.h" +#include "talk/p2p/base/common.h" #include "webrtc/base/buffer.h" #include "webrtc/base/dscp.h" #include "webrtc/base/messagequeue.h" -#include "webrtc/base/stream.h" #include "webrtc/base/sslstreamadapter.h" +#include "webrtc/base/stream.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/common.h" namespace cricket { diff --git a/talk/p2p/base/dtlstransportchannel.h b/talk/p2p/base/dtlstransportchannel.h index c4082d323b..44769c9b8e 100644 --- a/talk/p2p/base/dtlstransportchannel.h +++ b/talk/p2p/base/dtlstransportchannel.h @@ -32,11 +32,11 @@ #include #include +#include "talk/p2p/base/transportchannelimpl.h" #include "webrtc/base/buffer.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sslstreamadapter.h" #include "webrtc/base/stream.h" -#include "talk/p2p/base/transportchannelimpl.h" namespace cricket { diff --git a/talk/p2p/base/dtlstransportchannel_unittest.cc b/talk/p2p/base/dtlstransportchannel_unittest.cc index ce4951aa8f..bc1cf27893 100644 --- a/talk/p2p/base/dtlstransportchannel_unittest.cc +++ b/talk/p2p/base/dtlstransportchannel_unittest.cc @@ -28,18 +28,18 @@ #include +#include "talk/p2p/base/dtlstransport.h" +#include "talk/p2p/base/fakesession.h" #include "webrtc/base/common.h" #include "webrtc/base/dscp.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "talk/p2p/base/fakesession.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/sslidentity.h" #include "webrtc/base/sslstreamadapter.h" -#include "talk/p2p/base/dtlstransport.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" #define MAYBE_SKIP_TEST(feature) \ if (!(rtc::SSLStreamAdapter::feature())) { \ diff --git a/talk/p2p/base/fakesession.h b/talk/p2p/base/fakesession.h index 67b4cd9297..7c99719009 100644 --- a/talk/p2p/base/fakesession.h +++ b/talk/p2p/base/fakesession.h @@ -32,15 +32,15 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslfingerprint.h" -#include "webrtc/base/messagequeue.h" #include "talk/p2p/base/session.h" #include "talk/p2p/base/transport.h" #include "talk/p2p/base/transportchannel.h" #include "talk/p2p/base/transportchannelimpl.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/sslfingerprint.h" namespace cricket { diff --git a/talk/p2p/base/p2ptransport.cc b/talk/p2p/base/p2ptransport.cc index 89d2564c5f..b992cc0e02 100644 --- a/talk/p2p/base/p2ptransport.cc +++ b/talk/p2p/base/p2ptransport.cc @@ -30,10 +30,6 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/common.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/p2ptransportchannel.h" #include "talk/p2p/base/parsing.h" @@ -42,6 +38,10 @@ #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/common.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" namespace { diff --git a/talk/p2p/base/p2ptransportchannel.cc b/talk/p2p/base/p2ptransportchannel.cc index 8e56f158aa..b1dc223491 100644 --- a/talk/p2p/base/p2ptransportchannel.cc +++ b/talk/p2p/base/p2ptransportchannel.cc @@ -28,13 +28,13 @@ #include "talk/p2p/base/p2ptransportchannel.h" #include +#include "talk/p2p/base/common.h" +#include "talk/p2p/base/relayport.h" // For RELAY_PORT_TYPE. +#include "talk/p2p/base/stunport.h" // For STUN_PORT_TYPE. #include "webrtc/base/common.h" #include "webrtc/base/crc32.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" -#include "talk/p2p/base/common.h" -#include "talk/p2p/base/relayport.h" // For RELAY_PORT_TYPE. -#include "talk/p2p/base/stunport.h" // For STUN_PORT_TYPE. namespace { diff --git a/talk/p2p/base/p2ptransportchannel.h b/talk/p2p/base/p2ptransportchannel.h index b1c1607043..229e512ea0 100644 --- a/talk/p2p/base/p2ptransportchannel.h +++ b/talk/p2p/base/p2ptransportchannel.h @@ -38,16 +38,16 @@ #define TALK_P2P_BASE_P2PTRANSPORTCHANNEL_H_ #include -#include #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/sigslot.h" +#include #include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/portinterface.h" +#include "talk/p2p/base/p2ptransport.h" #include "talk/p2p/base/portallocator.h" +#include "talk/p2p/base/portinterface.h" #include "talk/p2p/base/transport.h" #include "talk/p2p/base/transportchannelimpl.h" -#include "talk/p2p/base/p2ptransport.h" +#include "webrtc/base/asyncpacketsocket.h" +#include "webrtc/base/sigslot.h" namespace cricket { diff --git a/talk/p2p/base/p2ptransportchannel_unittest.cc b/talk/p2p/base/p2ptransportchannel_unittest.cc index 79796cf58a..0b7f882f0a 100644 --- a/talk/p2p/base/p2ptransportchannel_unittest.cc +++ b/talk/p2p/base/p2ptransportchannel_unittest.cc @@ -25,6 +25,11 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/p2ptransportchannel.h" +#include "talk/p2p/base/testrelayserver.h" +#include "talk/p2p/base/teststunserver.h" +#include "talk/p2p/base/testturnserver.h" +#include "talk/p2p/client/basicportallocator.h" #include "webrtc/base/dscp.h" #include "webrtc/base/fakenetwork.h" #include "webrtc/base/firewallsocketserver.h" @@ -39,11 +44,6 @@ #include "webrtc/base/ssladapter.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/p2ptransportchannel.h" -#include "talk/p2p/base/testrelayserver.h" -#include "talk/p2p/base/teststunserver.h" -#include "talk/p2p/base/testturnserver.h" -#include "talk/p2p/client/basicportallocator.h" using cricket::kDefaultPortAllocatorFlags; using cricket::kMinimumStepDelay; diff --git a/talk/p2p/base/parsing.cc b/talk/p2p/base/parsing.cc index 1d7bf3ed6d..1465096628 100644 --- a/talk/p2p/base/parsing.cc +++ b/talk/p2p/base/parsing.cc @@ -27,8 +27,8 @@ #include "talk/p2p/base/parsing.h" -#include #include +#include #include "webrtc/base/stringutils.h" namespace { diff --git a/talk/p2p/base/parsing.h b/talk/p2p/base/parsing.h index fc6862d056..635b122b39 100644 --- a/talk/p2p/base/parsing.h +++ b/talk/p2p/base/parsing.h @@ -30,9 +30,9 @@ #include #include +#include "talk/xmllite/xmlelement.h" // Needed to delete ParseError.extra. #include "webrtc/base/basictypes.h" #include "webrtc/base/stringencode.h" -#include "talk/xmllite/xmlelement.h" // Needed to delete ParseError.extra. namespace cricket { diff --git a/talk/p2p/base/port.cc b/talk/p2p/base/port.cc index 42f7a95812..38201542cf 100644 --- a/talk/p2p/base/port.cc +++ b/talk/p2p/base/port.cc @@ -30,6 +30,7 @@ #include #include +#include "talk/p2p/base/common.h" #include "webrtc/base/base64.h" #include "webrtc/base/crc32.h" #include "webrtc/base/helpers.h" @@ -38,7 +39,6 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/stringutils.h" -#include "talk/p2p/base/common.h" namespace { diff --git a/talk/p2p/base/port.h b/talk/p2p/base/port.h index a417c0a02a..cccfdada25 100644 --- a/talk/p2p/base/port.h +++ b/talk/p2p/base/port.h @@ -28,11 +28,17 @@ #ifndef TALK_P2P_BASE_PORT_H_ #define TALK_P2P_BASE_PORT_H_ -#include -#include #include #include +#include +#include +#include "talk/p2p/base/candidate.h" +#include "talk/p2p/base/packetsocketfactory.h" +#include "talk/p2p/base/portinterface.h" +#include "talk/p2p/base/stun.h" +#include "talk/p2p/base/stunrequest.h" +#include "talk/p2p/base/transport.h" #include "webrtc/base/asyncpacketsocket.h" #include "webrtc/base/network.h" #include "webrtc/base/proxyinfo.h" @@ -40,12 +46,6 @@ #include "webrtc/base/sigslot.h" #include "webrtc/base/socketaddress.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/packetsocketfactory.h" -#include "talk/p2p/base/portinterface.h" -#include "talk/p2p/base/stun.h" -#include "talk/p2p/base/stunrequest.h" -#include "talk/p2p/base/transport.h" namespace cricket { diff --git a/talk/p2p/base/port_unittest.cc b/talk/p2p/base/port_unittest.cc index 9b9568caef..04becfcb7f 100644 --- a/talk/p2p/base/port_unittest.cc +++ b/talk/p2p/base/port_unittest.cc @@ -25,6 +25,16 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/base/portproxy.h" +#include "talk/p2p/base/relayport.h" +#include "talk/p2p/base/stunport.h" +#include "talk/p2p/base/tcpport.h" +#include "talk/p2p/base/testrelayserver.h" +#include "talk/p2p/base/teststunserver.h" +#include "talk/p2p/base/testturnserver.h" +#include "talk/p2p/base/transport.h" +#include "talk/p2p/base/turnport.h" #include "webrtc/base/crc32.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" @@ -38,16 +48,6 @@ #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/base/portproxy.h" -#include "talk/p2p/base/relayport.h" -#include "talk/p2p/base/stunport.h" -#include "talk/p2p/base/tcpport.h" -#include "talk/p2p/base/testrelayserver.h" -#include "talk/p2p/base/teststunserver.h" -#include "talk/p2p/base/testturnserver.h" -#include "talk/p2p/base/transport.h" -#include "talk/p2p/base/turnport.h" using rtc::AsyncPacketSocket; using rtc::ByteBuffer; diff --git a/talk/p2p/base/portallocator.h b/talk/p2p/base/portallocator.h index 6bea077700..84e5feac98 100644 --- a/talk/p2p/base/portallocator.h +++ b/talk/p2p/base/portallocator.h @@ -31,10 +31,10 @@ #include #include +#include "talk/p2p/base/portinterface.h" #include "webrtc/base/helpers.h" #include "webrtc/base/proxyinfo.h" #include "webrtc/base/sigslot.h" -#include "talk/p2p/base/portinterface.h" namespace cricket { diff --git a/talk/p2p/base/portallocatorsessionproxy.cc b/talk/p2p/base/portallocatorsessionproxy.cc index f7e36686cf..a6c80658f2 100644 --- a/talk/p2p/base/portallocatorsessionproxy.cc +++ b/talk/p2p/base/portallocatorsessionproxy.cc @@ -27,9 +27,9 @@ #include "talk/p2p/base/portallocatorsessionproxy.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/portallocator.h" #include "talk/p2p/base/portproxy.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/p2p/base/portallocatorsessionproxy_unittest.cc b/talk/p2p/base/portallocatorsessionproxy_unittest.cc index 95864d40b7..3a69b46663 100644 --- a/talk/p2p/base/portallocatorsessionproxy_unittest.cc +++ b/talk/p2p/base/portallocatorsessionproxy_unittest.cc @@ -27,13 +27,13 @@ #include -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/portallocatorsessionproxy.h" #include "talk/p2p/client/basicportallocator.h" #include "talk/p2p/client/fakeportallocator.h" +#include "webrtc/base/fakenetwork.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" using cricket::Candidate; using cricket::PortAllocatorSession; diff --git a/talk/p2p/base/portinterface.h b/talk/p2p/base/portinterface.h index a36c2b1db8..8cab5b41b2 100644 --- a/talk/p2p/base/portinterface.h +++ b/talk/p2p/base/portinterface.h @@ -30,8 +30,8 @@ #include -#include "webrtc/base/socketaddress.h" #include "talk/p2p/base/transport.h" +#include "webrtc/base/socketaddress.h" namespace rtc { class Network; diff --git a/talk/p2p/base/portproxy.h b/talk/p2p/base/portproxy.h index da555cce6e..8c28223d3e 100644 --- a/talk/p2p/base/portproxy.h +++ b/talk/p2p/base/portproxy.h @@ -28,8 +28,8 @@ #ifndef TALK_P2P_BASE_PORTPROXY_H_ #define TALK_P2P_BASE_PORTPROXY_H_ -#include "webrtc/base/sigslot.h" #include "talk/p2p/base/portinterface.h" +#include "webrtc/base/sigslot.h" namespace rtc { class Network; diff --git a/talk/p2p/base/pseudotcp_unittest.cc b/talk/p2p/base/pseudotcp_unittest.cc index 8ca3ce1a32..d9435cff5f 100644 --- a/talk/p2p/base/pseudotcp_unittest.cc +++ b/talk/p2p/base/pseudotcp_unittest.cc @@ -27,13 +27,13 @@ #include +#include "talk/p2p/base/pseudotcp.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/messagehandler.h" #include "webrtc/base/stream.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "talk/p2p/base/pseudotcp.h" using cricket::PseudoTcp; diff --git a/talk/p2p/base/rawtransport.cc b/talk/p2p/base/rawtransport.cc index 60f8879271..59131771a9 100644 --- a/talk/p2p/base/rawtransport.cc +++ b/talk/p2p/base/rawtransport.cc @@ -27,15 +27,15 @@ #include #include -#include "talk/p2p/base/rawtransport.h" -#include "webrtc/base/common.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/parsing.h" -#include "talk/p2p/base/sessionmanager.h" +#include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/rawtransportchannel.h" +#include "talk/p2p/base/sessionmanager.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/common.h" #if defined(FEATURE_ENABLE_PSTN) namespace cricket { diff --git a/talk/p2p/base/rawtransportchannel.cc b/talk/p2p/base/rawtransportchannel.cc index 4df069202e..ef0a532202 100644 --- a/talk/p2p/base/rawtransportchannel.cc +++ b/talk/p2p/base/rawtransportchannel.cc @@ -29,7 +29,6 @@ #include #include -#include "webrtc/base/common.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/portallocator.h" #include "talk/p2p/base/portinterface.h" @@ -40,6 +39,7 @@ #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/common.h" #if defined(FEATURE_ENABLE_PSTN) diff --git a/talk/p2p/base/rawtransportchannel.h b/talk/p2p/base/rawtransportchannel.h index 43c25e5a90..8fbf073a87 100644 --- a/talk/p2p/base/rawtransportchannel.h +++ b/talk/p2p/base/rawtransportchannel.h @@ -30,10 +30,10 @@ #include #include -#include "webrtc/base/messagequeue.h" -#include "talk/p2p/base/transportchannelimpl.h" -#include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/candidate.h" +#include "talk/p2p/base/rawtransport.h" +#include "talk/p2p/base/transportchannelimpl.h" +#include "webrtc/base/messagequeue.h" #if defined(FEATURE_ENABLE_PSTN) diff --git a/talk/p2p/base/relayport.cc b/talk/p2p/base/relayport.cc index 9de08971cc..55052a589c 100644 --- a/talk/p2p/base/relayport.cc +++ b/talk/p2p/base/relayport.cc @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/relayport.h" #include "webrtc/base/asyncpacketsocket.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" -#include "talk/p2p/base/relayport.h" namespace cricket { diff --git a/talk/p2p/base/relayport_unittest.cc b/talk/p2p/base/relayport_unittest.cc index f7b7fa7e37..25777d12e2 100644 --- a/talk/p2p/base/relayport_unittest.cc +++ b/talk/p2p/base/relayport_unittest.cc @@ -25,9 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/logging.h" +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/base/relayport.h" +#include "talk/p2p/base/relayserver.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/socketadapters.h" @@ -35,9 +38,6 @@ #include "webrtc/base/ssladapter.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/base/relayport.h" -#include "talk/p2p/base/relayserver.h" using rtc::SocketAddress; diff --git a/talk/p2p/base/relayserver.h b/talk/p2p/base/relayserver.h index 5a5b5e2b7c..248d0e7c12 100644 --- a/talk/p2p/base/relayserver.h +++ b/talk/p2p/base/relayserver.h @@ -28,16 +28,16 @@ #ifndef TALK_P2P_BASE_RELAYSERVER_H_ #define TALK_P2P_BASE_RELAYSERVER_H_ +#include #include #include -#include +#include "talk/p2p/base/port.h" +#include "talk/p2p/base/stun.h" #include "webrtc/base/asyncudpsocket.h" #include "webrtc/base/socketaddresspair.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "talk/p2p/base/port.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/relayserver_unittest.cc b/talk/p2p/base/relayserver_unittest.cc index 43d288d8ed..1091807635 100644 --- a/talk/p2p/base/relayserver_unittest.cc +++ b/talk/p2p/base/relayserver_unittest.cc @@ -27,6 +27,7 @@ #include +#include "talk/p2p/base/relayserver.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" @@ -35,7 +36,6 @@ #include "webrtc/base/ssladapter.h" #include "webrtc/base/testclient.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/relayserver.h" using rtc::SocketAddress; using namespace cricket; diff --git a/talk/p2p/base/session.cc b/talk/p2p/base/session.cc index 6c98fe16f3..a9bf815798 100644 --- a/talk/p2p/base/session.cc +++ b/talk/p2p/base/session.cc @@ -27,20 +27,20 @@ #include "talk/p2p/base/session.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/common.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sslstreamadapter.h" -#include "talk/xmpp/constants.h" -#include "talk/xmpp/jid.h" #include "talk/p2p/base/dtlstransport.h" #include "talk/p2p/base/p2ptransport.h" #include "talk/p2p/base/sessionclient.h" #include "talk/p2p/base/transport.h" #include "talk/p2p/base/transportchannelproxy.h" #include "talk/p2p/base/transportinfo.h" +#include "talk/xmpp/constants.h" +#include "talk/xmpp/jid.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/common.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sslstreamadapter.h" #include "talk/p2p/base/constants.h" diff --git a/talk/p2p/base/session.h b/talk/p2p/base/session.h index 2c6c252d0e..756bbe0ad2 100644 --- a/talk/p2p/base/session.h +++ b/talk/p2p/base/session.h @@ -33,10 +33,6 @@ #include #include -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/socketaddress.h" #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/port.h" #include "talk/p2p/base/sessionclient.h" @@ -45,6 +41,10 @@ #include "talk/p2p/base/transport.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/refcount.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/base/socketaddress.h" namespace cricket { diff --git a/talk/p2p/base/session_unittest.cc b/talk/p2p/base/session_unittest.cc index 758c5e9b91..90cd06d24a 100644 --- a/talk/p2p/base/session_unittest.cc +++ b/talk/p2p/base/session_unittest.cc @@ -27,23 +27,15 @@ #include -#include #include #include +#include -#include "webrtc/base/base64.h" -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/natserver.h" -#include "webrtc/base/natsocketfactory.h" -#include "webrtc/base/stringencode.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/constants.h" +#include "talk/p2p/base/p2ptransport.h" #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/portallocator.h" -#include "talk/p2p/base/p2ptransport.h" #include "talk/p2p/base/relayport.h" #include "talk/p2p/base/relayserver.h" #include "talk/p2p/base/session.h" @@ -55,6 +47,14 @@ #include "talk/p2p/base/transportchannelproxy.h" #include "talk/p2p/base/udpport.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/natserver.h" +#include "webrtc/base/natsocketfactory.h" +#include "webrtc/base/stringencode.h" using cricket::SignalingProtocol; using cricket::PROTOCOL_HYBRID; diff --git a/talk/p2p/base/sessiondescription.h b/talk/p2p/base/sessiondescription.h index 8d56a96222..56dd412b74 100644 --- a/talk/p2p/base/sessiondescription.h +++ b/talk/p2p/base/sessiondescription.h @@ -31,8 +31,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "talk/p2p/base/transportinfo.h" +#include "webrtc/base/constructormagic.h" namespace cricket { diff --git a/talk/p2p/base/sessionmanager.cc b/talk/p2p/base/sessionmanager.cc index a8782c4503..d173517858 100644 --- a/talk/p2p/base/sessionmanager.cc +++ b/talk/p2p/base/sessionmanager.cc @@ -27,16 +27,16 @@ #include "talk/p2p/base/sessionmanager.h" -#include "webrtc/base/common.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringencode.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/session.h" #include "talk/p2p/base/sessionmessages.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" +#include "webrtc/base/common.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stringencode.h" namespace cricket { diff --git a/talk/p2p/base/sessionmanager.h b/talk/p2p/base/sessionmanager.h index 55cf78d4e0..92aeb3d067 100644 --- a/talk/p2p/base/sessionmanager.h +++ b/talk/p2p/base/sessionmanager.h @@ -33,10 +33,10 @@ #include #include -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/portallocator.h" #include "talk/p2p/base/transportdescriptionfactory.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace buzz { class QName; diff --git a/talk/p2p/base/sessionmessages.cc b/talk/p2p/base/sessionmessages.cc index a542dfd1b6..bfba2736fb 100644 --- a/talk/p2p/base/sessionmessages.cc +++ b/talk/p2p/base/sessionmessages.cc @@ -30,9 +30,6 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringutils.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/p2ptransport.h" #include "talk/p2p/base/parsing.h" @@ -41,6 +38,9 @@ #include "talk/p2p/base/transport.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stringutils.h" namespace cricket { diff --git a/talk/p2p/base/sessionmessages.h b/talk/p2p/base/sessionmessages.h index d11c4603b4..38fca98f33 100644 --- a/talk/p2p/base/sessionmessages.h +++ b/talk/p2p/base/sessionmessages.h @@ -28,16 +28,16 @@ #ifndef TALK_P2P_BASE_SESSIONMESSAGES_H_ #define TALK_P2P_BASE_SESSIONMESSAGES_H_ +#include #include #include -#include -#include "webrtc/base/basictypes.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/sessiondescription.h" // Needed to delete contents. #include "talk/p2p/base/transportinfo.h" #include "talk/xmllite/xmlelement.h" +#include "webrtc/base/basictypes.h" namespace cricket { diff --git a/talk/p2p/base/stun_unittest.cc b/talk/p2p/base/stun_unittest.cc index 05a0f6cc6a..00dffed31b 100644 --- a/talk/p2p/base/stun_unittest.cc +++ b/talk/p2p/base/stun_unittest.cc @@ -27,13 +27,13 @@ #include +#include "talk/p2p/base/stun.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/messagedigest.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/socketaddress.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/stunport.cc b/talk/p2p/base/stunport.cc index 2ed0fa759d..a178eb4897 100644 --- a/talk/p2p/base/stunport.cc +++ b/talk/p2p/base/stunport.cc @@ -27,12 +27,12 @@ #include "talk/p2p/base/stunport.h" -#include "webrtc/base/common.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/nethelpers.h" #include "talk/p2p/base/common.h" #include "talk/p2p/base/stun.h" +#include "webrtc/base/common.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/nethelpers.h" namespace cricket { diff --git a/talk/p2p/base/stunport.h b/talk/p2p/base/stunport.h index d5457ba168..0a49b67d28 100644 --- a/talk/p2p/base/stunport.h +++ b/talk/p2p/base/stunport.h @@ -30,9 +30,9 @@ #include -#include "webrtc/base/asyncpacketsocket.h" #include "talk/p2p/base/port.h" #include "talk/p2p/base/stunrequest.h" +#include "webrtc/base/asyncpacketsocket.h" // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h. namespace rtc { diff --git a/talk/p2p/base/stunport_unittest.cc b/talk/p2p/base/stunport_unittest.cc index 8d2c7cf627..6506181f3b 100644 --- a/talk/p2p/base/stunport_unittest.cc +++ b/talk/p2p/base/stunport_unittest.cc @@ -25,6 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/base/stunport.h" +#include "talk/p2p/base/teststunserver.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/physicalsocketserver.h" @@ -32,9 +35,6 @@ #include "webrtc/base/socketaddress.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/base/stunport.h" -#include "talk/p2p/base/teststunserver.h" using cricket::ServerAddresses; using rtc::SocketAddress; diff --git a/talk/p2p/base/stunrequest.h b/talk/p2p/base/stunrequest.h index 8e6fbf28b9..374f7e7b3f 100644 --- a/talk/p2p/base/stunrequest.h +++ b/talk/p2p/base/stunrequest.h @@ -28,11 +28,11 @@ #ifndef TALK_P2P_BASE_STUNREQUEST_H_ #define TALK_P2P_BASE_STUNREQUEST_H_ -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" -#include "talk/p2p/base/stun.h" #include #include +#include "talk/p2p/base/stun.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/p2p/base/stunrequest_unittest.cc b/talk/p2p/base/stunrequest_unittest.cc index 6d6ecad41b..3c422148f3 100644 --- a/talk/p2p/base/stunrequest_unittest.cc +++ b/talk/p2p/base/stunrequest_unittest.cc @@ -25,12 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/stunrequest.h" #include "webrtc/base/gunit.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/timeutils.h" -#include "talk/p2p/base/stunrequest.h" using namespace cricket; diff --git a/talk/p2p/base/stunserver.h b/talk/p2p/base/stunserver.h index e5d72bc625..1e1440844c 100644 --- a/talk/p2p/base/stunserver.h +++ b/talk/p2p/base/stunserver.h @@ -28,9 +28,9 @@ #ifndef TALK_P2P_BASE_STUNSERVER_H_ #define TALK_P2P_BASE_STUNSERVER_H_ +#include "talk/p2p/base/stun.h" #include "webrtc/base/asyncudpsocket.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/stunserver_unittest.cc b/talk/p2p/base/stunserver_unittest.cc index 1c26e22b4c..405d8aeab1 100644 --- a/talk/p2p/base/stunserver_unittest.cc +++ b/talk/p2p/base/stunserver_unittest.cc @@ -27,13 +27,13 @@ #include +#include "talk/p2p/base/stunserver.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" #include "webrtc/base/physicalsocketserver.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/base/testclient.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/stunserver.h" +#include "webrtc/base/virtualsocketserver.h" using namespace cricket; diff --git a/talk/p2p/base/tcpport.cc b/talk/p2p/base/tcpport.cc index 74d566d0f6..cb5b7266d6 100644 --- a/talk/p2p/base/tcpport.cc +++ b/talk/p2p/base/tcpport.cc @@ -27,9 +27,9 @@ #include "talk/p2p/base/tcpport.h" +#include "talk/p2p/base/common.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "talk/p2p/base/common.h" namespace cricket { diff --git a/talk/p2p/base/tcpport.h b/talk/p2p/base/tcpport.h index 8d1b963eab..97bd977317 100644 --- a/talk/p2p/base/tcpport.h +++ b/talk/p2p/base/tcpport.h @@ -28,10 +28,10 @@ #ifndef TALK_P2P_BASE_TCPPORT_H_ #define TALK_P2P_BASE_TCPPORT_H_ -#include #include -#include "webrtc/base/asyncpacketsocket.h" +#include #include "talk/p2p/base/port.h" +#include "webrtc/base/asyncpacketsocket.h" namespace cricket { diff --git a/talk/p2p/base/testrelayserver.h b/talk/p2p/base/testrelayserver.h index c6fdf73a77..eaeefc8014 100644 --- a/talk/p2p/base/testrelayserver.h +++ b/talk/p2p/base/testrelayserver.h @@ -28,12 +28,12 @@ #ifndef TALK_P2P_BASE_TESTRELAYSERVER_H_ #define TALK_P2P_BASE_TESTRELAYSERVER_H_ +#include "talk/p2p/base/relayserver.h" #include "webrtc/base/asynctcpsocket.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/socketadapters.h" #include "webrtc/base/sigslot.h" +#include "webrtc/base/socketadapters.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/relayserver.h" namespace cricket { diff --git a/talk/p2p/base/teststunserver.h b/talk/p2p/base/teststunserver.h index 131ce6912a..6f85009ab6 100644 --- a/talk/p2p/base/teststunserver.h +++ b/talk/p2p/base/teststunserver.h @@ -28,9 +28,9 @@ #ifndef TALK_P2P_BASE_TESTSTUNSERVER_H_ #define TALK_P2P_BASE_TESTSTUNSERVER_H_ +#include "talk/p2p/base/stunserver.h" #include "webrtc/base/socketaddress.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/stunserver.h" namespace cricket { diff --git a/talk/p2p/base/testturnserver.h b/talk/p2p/base/testturnserver.h index 3b7f765f0a..e2c0ccb4e4 100644 --- a/talk/p2p/base/testturnserver.h +++ b/talk/p2p/base/testturnserver.h @@ -30,11 +30,11 @@ #include -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/stun.h" #include "talk/p2p/base/turnserver.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/p2p/base/transport.cc b/talk/p2p/base/transport.cc index 6ca3628c3f..6ee7b2a7ef 100644 --- a/talk/p2p/base/transport.cc +++ b/talk/p2p/base/transport.cc @@ -27,17 +27,17 @@ #include "talk/p2p/base/transport.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/common.h" -#include "webrtc/base/logging.h" #include "talk/p2p/base/candidate.h" #include "talk/p2p/base/constants.h" -#include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/port.h" +#include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/transportchannelimpl.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/bind.h" +#include "webrtc/base/common.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/p2p/base/transport.h b/talk/p2p/base/transport.h index 0ce12e7c81..21661f6ea9 100644 --- a/talk/p2p/base/transport.h +++ b/talk/p2p/base/transport.h @@ -46,17 +46,17 @@ #ifndef TALK_P2P_BASE_TRANSPORT_H_ #define TALK_P2P_BASE_TRANSPORT_H_ -#include #include +#include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslstreamadapter.h" #include "talk/p2p/base/candidate.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/sessiondescription.h" #include "talk/p2p/base/transportinfo.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/sslstreamadapter.h" namespace rtc { class Thread; diff --git a/talk/p2p/base/transport_unittest.cc b/talk/p2p/base/transport_unittest.cc index f605bbcaf1..fa2c116627 100644 --- a/talk/p2p/base/transport_unittest.cc +++ b/talk/p2p/base/transport_unittest.cc @@ -25,17 +25,17 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/fakesession.h" -#include "talk/p2p/base/parsing.h" #include "talk/p2p/base/p2ptransport.h" +#include "talk/p2p/base/parsing.h" #include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/sessionmessages.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" using cricket::Candidate; using cricket::Candidates; diff --git a/talk/p2p/base/transportchannel.h b/talk/p2p/base/transportchannel.h index b8043206cd..b0beb044fc 100644 --- a/talk/p2p/base/transportchannel.h +++ b/talk/p2p/base/transportchannel.h @@ -31,6 +31,9 @@ #include #include +#include "talk/p2p/base/candidate.h" +#include "talk/p2p/base/transport.h" +#include "talk/p2p/base/transportdescription.h" #include "webrtc/base/asyncpacketsocket.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/dscp.h" @@ -38,9 +41,6 @@ #include "webrtc/base/socket.h" #include "webrtc/base/sslidentity.h" #include "webrtc/base/sslstreamadapter.h" -#include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/transport.h" -#include "talk/p2p/base/transportdescription.h" namespace cricket { diff --git a/talk/p2p/base/transportchannelproxy.cc b/talk/p2p/base/transportchannelproxy.cc index 28d7ff415a..9fa0b6a51a 100644 --- a/talk/p2p/base/transportchannelproxy.cc +++ b/talk/p2p/base/transportchannelproxy.cc @@ -25,12 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/transport.h" +#include "talk/p2p/base/transportchannelimpl.h" #include "talk/p2p/base/transportchannelproxy.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/transport.h" -#include "talk/p2p/base/transportchannelimpl.h" namespace cricket { diff --git a/talk/p2p/base/transportchannelproxy.h b/talk/p2p/base/transportchannelproxy.h index 2a1d21a51b..07b90903e7 100644 --- a/talk/p2p/base/transportchannelproxy.h +++ b/talk/p2p/base/transportchannelproxy.h @@ -32,8 +32,8 @@ #include #include -#include "webrtc/base/messagehandler.h" #include "talk/p2p/base/transportchannel.h" +#include "webrtc/base/messagehandler.h" namespace rtc { class Thread; diff --git a/talk/p2p/base/transportdescription.h b/talk/p2p/base/transportdescription.h index 5891ca6a35..efd04ffe0a 100644 --- a/talk/p2p/base/transportdescription.h +++ b/talk/p2p/base/transportdescription.h @@ -32,10 +32,10 @@ #include #include -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sslfingerprint.h" #include "talk/p2p/base/candidate.h" #include "talk/p2p/base/constants.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sslfingerprint.h" namespace cricket { diff --git a/talk/p2p/base/transportdescriptionfactory.cc b/talk/p2p/base/transportdescriptionfactory.cc index 0d6308e39f..4eb603c3ea 100644 --- a/talk/p2p/base/transportdescriptionfactory.cc +++ b/talk/p2p/base/transportdescriptionfactory.cc @@ -27,12 +27,12 @@ #include "talk/p2p/base/transportdescriptionfactory.h" +#include "talk/p2p/base/transportdescription.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/messagedigest.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sslfingerprint.h" -#include "talk/p2p/base/transportdescription.h" namespace cricket { diff --git a/talk/p2p/base/transportdescriptionfactory_unittest.cc b/talk/p2p/base/transportdescriptionfactory_unittest.cc index ade331d950..b7f7008977 100644 --- a/talk/p2p/base/transportdescriptionfactory_unittest.cc +++ b/talk/p2p/base/transportdescriptionfactory_unittest.cc @@ -28,11 +28,11 @@ #include #include -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/transportdescription.h" #include "talk/p2p/base/transportdescriptionfactory.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" using rtc::scoped_ptr; using cricket::TransportDescriptionFactory; diff --git a/talk/p2p/base/transportinfo.h b/talk/p2p/base/transportinfo.h index aab022cfd2..5ffb10accd 100644 --- a/talk/p2p/base/transportinfo.h +++ b/talk/p2p/base/transportinfo.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/helpers.h" #include "talk/p2p/base/candidate.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/transportdescription.h" +#include "webrtc/base/helpers.h" namespace cricket { diff --git a/talk/p2p/base/turnport.cc b/talk/p2p/base/turnport.cc index 3fa68297bd..3faacd1011 100644 --- a/talk/p2p/base/turnport.cc +++ b/talk/p2p/base/turnport.cc @@ -29,6 +29,8 @@ #include +#include "talk/p2p/base/common.h" +#include "talk/p2p/base/stun.h" #include "webrtc/base/asyncpacketsocket.h" #include "webrtc/base/byteorder.h" #include "webrtc/base/common.h" @@ -36,8 +38,6 @@ #include "webrtc/base/nethelpers.h" #include "webrtc/base/socketaddress.h" #include "webrtc/base/stringencode.h" -#include "talk/p2p/base/common.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/turnport.h b/talk/p2p/base/turnport.h index d58e75df0a..d73b11da97 100644 --- a/talk/p2p/base/turnport.h +++ b/talk/p2p/base/turnport.h @@ -29,12 +29,12 @@ #define TALK_P2P_BASE_TURNPORT_H_ #include -#include #include +#include -#include "webrtc/base/asyncpacketsocket.h" #include "talk/p2p/base/port.h" #include "talk/p2p/client/basicportallocator.h" +#include "webrtc/base/asyncpacketsocket.h" namespace rtc { class AsyncResolver; diff --git a/talk/p2p/base/turnport_unittest.cc b/talk/p2p/base/turnport_unittest.cc index 99bd598362..4582dc031a 100644 --- a/talk/p2p/base/turnport_unittest.cc +++ b/talk/p2p/base/turnport_unittest.cc @@ -28,25 +28,25 @@ #include #endif -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/firewallsocketserver.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/physicalsocketserver.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/tcpport.h" #include "talk/p2p/base/testturnserver.h" #include "talk/p2p/base/turnport.h" #include "talk/p2p/base/udpport.h" +#include "webrtc/base/asynctcpsocket.h" +#include "webrtc/base/buffer.h" +#include "webrtc/base/dscp.h" +#include "webrtc/base/firewallsocketserver.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/physicalsocketserver.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/virtualsocketserver.h" using rtc::SocketAddress; using cricket::Connection; diff --git a/talk/p2p/base/turnserver.cc b/talk/p2p/base/turnserver.cc index a6cafe0153..abc065ace9 100644 --- a/talk/p2p/base/turnserver.cc +++ b/talk/p2p/base/turnserver.cc @@ -27,6 +27,10 @@ #include "talk/p2p/base/turnserver.h" +#include "talk/p2p/base/asyncstuntcpsocket.h" +#include "talk/p2p/base/common.h" +#include "talk/p2p/base/packetsocketfactory.h" +#include "talk/p2p/base/stun.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" @@ -34,10 +38,6 @@ #include "webrtc/base/socketadapters.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/asyncstuntcpsocket.h" -#include "talk/p2p/base/common.h" -#include "talk/p2p/base/packetsocketfactory.h" -#include "talk/p2p/base/stun.h" namespace cricket { diff --git a/talk/p2p/base/turnserver.h b/talk/p2p/base/turnserver.h index faf41fe3d5..4798232813 100644 --- a/talk/p2p/base/turnserver.h +++ b/talk/p2p/base/turnserver.h @@ -33,11 +33,11 @@ #include #include +#include "talk/p2p/base/portinterface.h" #include "webrtc/base/asyncpacketsocket.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/socketaddress.h" -#include "talk/p2p/base/portinterface.h" namespace rtc { class ByteBuffer; diff --git a/talk/p2p/client/autoportallocator.h b/talk/p2p/client/autoportallocator.h index c6271d0104..298f82918d 100644 --- a/talk/p2p/client/autoportallocator.h +++ b/talk/p2p/client/autoportallocator.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/sigslot.h" #include "talk/p2p/client/httpportallocator.h" #include "talk/xmpp/jingleinfotask.h" #include "talk/xmpp/xmppclient.h" +#include "webrtc/base/sigslot.h" // This class sets the relay and stun servers using XmppClient. // It enables the client to traverse Proxy and NAT. diff --git a/talk/p2p/client/basicportallocator.cc b/talk/p2p/client/basicportallocator.cc index 0a3fab16de..d39db8f157 100644 --- a/talk/p2p/client/basicportallocator.cc +++ b/talk/p2p/client/basicportallocator.cc @@ -30,9 +30,6 @@ #include #include -#include "webrtc/base/common.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/common.h" #include "talk/p2p/base/port.h" @@ -41,6 +38,9 @@ #include "talk/p2p/base/tcpport.h" #include "talk/p2p/base/turnport.h" #include "talk/p2p/base/udpport.h" +#include "webrtc/base/common.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" using rtc::CreateRandomId; using rtc::CreateRandomString; diff --git a/talk/p2p/client/basicportallocator.h b/talk/p2p/client/basicportallocator.h index ca1deab6e2..5f43880dc0 100644 --- a/talk/p2p/client/basicportallocator.h +++ b/talk/p2p/client/basicportallocator.h @@ -31,12 +31,12 @@ #include #include +#include "talk/p2p/base/port.h" +#include "talk/p2p/base/portallocator.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/network.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/port.h" -#include "talk/p2p/base/portallocator.h" namespace cricket { diff --git a/talk/p2p/client/connectivitychecker.cc b/talk/p2p/client/connectivitychecker.cc index dd8673a640..06de5e48aa 100644 --- a/talk/p2p/client/connectivitychecker.cc +++ b/talk/p2p/client/connectivitychecker.cc @@ -5,20 +5,20 @@ #include "talk/p2p/client/connectivitychecker.h" -#include "webrtc/base/asynchttprequest.h" -#include "webrtc/base/autodetectproxy.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/httpcommon.h" -#include "webrtc/base/httpcommon-inl.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/proxydetect.h" -#include "webrtc/base/thread.h" #include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/constants.h" #include "talk/p2p/base/common.h" +#include "talk/p2p/base/constants.h" #include "talk/p2p/base/port.h" #include "talk/p2p/base/relayport.h" #include "talk/p2p/base/stunport.h" +#include "webrtc/base/asynchttprequest.h" +#include "webrtc/base/autodetectproxy.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/httpcommon-inl.h" +#include "webrtc/base/httpcommon.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/proxydetect.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/p2p/client/connectivitychecker.h b/talk/p2p/client/connectivitychecker.h index b4423c4c11..d4cda1eeee 100644 --- a/talk/p2p/client/connectivitychecker.h +++ b/talk/p2p/client/connectivitychecker.h @@ -7,15 +7,15 @@ #include #include -#include "webrtc/base/network.h" +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/client/httpportallocator.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/messagehandler.h" +#include "webrtc/base/network.h" #include "webrtc/base/proxyinfo.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/socketaddress.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/client/httpportallocator.h" namespace rtc { class AsyncHttpRequest; diff --git a/talk/p2p/client/connectivitychecker_unittest.cc b/talk/p2p/client/connectivitychecker_unittest.cc index 51bdfef2d8..b96cf1769f 100644 --- a/talk/p2p/client/connectivitychecker_unittest.cc +++ b/talk/p2p/client/connectivitychecker_unittest.cc @@ -3,16 +3,16 @@ #include -#include "webrtc/base/asynchttprequest.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/socketaddress.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/relayport.h" #include "talk/p2p/base/stunport.h" #include "talk/p2p/client/connectivitychecker.h" #include "talk/p2p/client/httpportallocator.h" +#include "webrtc/base/asynchttprequest.h" +#include "webrtc/base/fakenetwork.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/socketaddress.h" namespace cricket { diff --git a/talk/p2p/client/fakeportallocator.h b/talk/p2p/client/fakeportallocator.h index d54f644822..6c36c4e383 100644 --- a/talk/p2p/client/fakeportallocator.h +++ b/talk/p2p/client/fakeportallocator.h @@ -6,10 +6,10 @@ #define TALK_P2P_CLIENT_FAKEPORTALLOCATOR_H_ #include -#include "webrtc/base/scoped_ptr.h" #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/base/portallocator.h" #include "talk/p2p/base/udpport.h" +#include "webrtc/base/scoped_ptr.h" namespace rtc { class SocketFactory; diff --git a/talk/p2p/client/portallocator_unittest.cc b/talk/p2p/client/portallocator_unittest.cc index bddf0c3c50..57cfbe3e7a 100644 --- a/talk/p2p/client/portallocator_unittest.cc +++ b/talk/p2p/client/portallocator_unittest.cc @@ -25,6 +25,15 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/base/constants.h" +#include "talk/p2p/base/p2ptransportchannel.h" +#include "talk/p2p/base/portallocatorsessionproxy.h" +#include "talk/p2p/base/testrelayserver.h" +#include "talk/p2p/base/teststunserver.h" +#include "talk/p2p/base/testturnserver.h" +#include "talk/p2p/client/basicportallocator.h" +#include "talk/p2p/client/httpportallocator.h" #include "webrtc/base/fakenetwork.h" #include "webrtc/base/firewallsocketserver.h" #include "webrtc/base/gunit.h" @@ -38,15 +47,6 @@ #include "webrtc/base/ssladapter.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/base/constants.h" -#include "talk/p2p/base/p2ptransportchannel.h" -#include "talk/p2p/base/portallocatorsessionproxy.h" -#include "talk/p2p/base/testrelayserver.h" -#include "talk/p2p/base/teststunserver.h" -#include "talk/p2p/base/testturnserver.h" -#include "talk/p2p/client/basicportallocator.h" -#include "talk/p2p/client/httpportallocator.h" using cricket::ServerAddresses; using rtc::SocketAddress; diff --git a/talk/p2p/client/sessionsendtask.h b/talk/p2p/client/sessionsendtask.h index 208386e8f4..c8734d29bc 100644 --- a/talk/p2p/client/sessionsendtask.h +++ b/talk/p2p/client/sessionsendtask.h @@ -28,12 +28,12 @@ #ifndef TALK_P2P_CLIENT_SESSIONSENDTASK_H_ #define TALK_P2P_CLIENT_SESSIONSENDTASK_H_ -#include "webrtc/base/common.h" +#include "talk/p2p/base/sessionmanager.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/p2p/base/sessionmanager.h" +#include "webrtc/base/common.h" namespace cricket { diff --git a/talk/p2p/client/socketmonitor.h b/talk/p2p/client/socketmonitor.h index dd540c8702..87b11cf400 100644 --- a/talk/p2p/client/socketmonitor.h +++ b/talk/p2p/client/socketmonitor.h @@ -30,10 +30,10 @@ #include +#include "talk/p2p/base/transportchannel.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/transportchannel.h" namespace cricket { diff --git a/talk/session/media/audiomonitor.cc b/talk/session/media/audiomonitor.cc index dc4a42a8de..aa4a87dd31 100644 --- a/talk/session/media/audiomonitor.cc +++ b/talk/session/media/audiomonitor.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "talk/session/media/audiomonitor.h" #include "talk/session/media/voicechannel.h" -#include namespace cricket { diff --git a/talk/session/media/audiomonitor.h b/talk/session/media/audiomonitor.h index 632ba07492..e5585a4933 100644 --- a/talk/session/media/audiomonitor.h +++ b/talk/session/media/audiomonitor.h @@ -28,10 +28,10 @@ #ifndef TALK_SESSION_MEDIA_AUDIOMONITOR_H_ #define TALK_SESSION_MEDIA_AUDIOMONITOR_H_ +#include +#include "talk/p2p/base/port.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/thread.h" -#include "talk/p2p/base/port.h" -#include namespace cricket { diff --git a/talk/session/media/bundlefilter.cc b/talk/session/media/bundlefilter.cc index 5b23f11466..1d2a0313bc 100755 --- a/talk/session/media/bundlefilter.cc +++ b/talk/session/media/bundlefilter.cc @@ -27,8 +27,8 @@ #include "talk/session/media/bundlefilter.h" -#include "webrtc/base/logging.h" #include "talk/media/base/rtputils.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/session/media/bundlefilter.h b/talk/session/media/bundlefilter.h index 9df742ab7d..a4980412f0 100755 --- a/talk/session/media/bundlefilter.h +++ b/talk/session/media/bundlefilter.h @@ -31,8 +31,8 @@ #include #include -#include "webrtc/base/basictypes.h" #include "talk/media/base/streamparams.h" +#include "webrtc/base/basictypes.h" namespace cricket { diff --git a/talk/session/media/bundlefilter_unittest.cc b/talk/session/media/bundlefilter_unittest.cc index 4cf6cb0655..806d6bab09 100755 --- a/talk/session/media/bundlefilter_unittest.cc +++ b/talk/session/media/bundlefilter_unittest.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/session/media/bundlefilter.h" +#include "webrtc/base/gunit.h" using cricket::StreamParams; diff --git a/talk/session/media/call.cc b/talk/session/media/call.cc index ac02e7ce69..56d886d237 100644 --- a/talk/session/media/call.cc +++ b/talk/session/media/call.cc @@ -26,16 +26,16 @@ */ #include -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/window.h" #include "talk/media/base/constants.h" #include "talk/media/base/screencastid.h" #include "talk/p2p/base/parsing.h" #include "talk/session/media/call.h" #include "talk/session/media/currentspeakermonitor.h" #include "talk/session/media/mediasessionclient.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/window.h" namespace cricket { diff --git a/talk/session/media/call.h b/talk/session/media/call.h index 3122f55675..a81e74aa77 100644 --- a/talk/session/media/call.h +++ b/talk/session/media/call.h @@ -33,7 +33,6 @@ #include #include -#include "webrtc/base/messagequeue.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/screencastid.h" #include "talk/media/base/streamparams.h" @@ -45,6 +44,7 @@ #include "talk/session/media/mediamessages.h" #include "talk/session/media/mediasession.h" #include "talk/xmpp/jid.h" +#include "webrtc/base/messagequeue.h" namespace cricket { diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h index 4d3baf6134..6da29a4ae3 100644 --- a/talk/session/media/channel.h +++ b/talk/session/media/channel.h @@ -31,11 +31,6 @@ #include #include -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/network.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/window.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/mediaengine.h" #include "talk/media/base/streamparams.h" @@ -48,6 +43,11 @@ #include "talk/session/media/mediasession.h" #include "talk/session/media/rtcpmuxfilter.h" #include "talk/session/media/srtpfilter.h" +#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/network.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/window.h" namespace cricket { diff --git a/talk/session/media/channel_unittest.cc b/talk/session/media/channel_unittest.cc index b2fc92b321..625b802827 100644 --- a/talk/session/media/channel_unittest.cc +++ b/talk/session/media/channel_unittest.cc @@ -24,8 +24,8 @@ // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "talk/media/base/fakemediaengine.h" -#include "talk/media/base/fakescreencapturerfactory.h" #include "talk/media/base/fakertp.h" +#include "talk/media/base/fakescreencapturerfactory.h" #include "talk/media/base/fakevideocapturer.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/rtpdump.h" diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc index f3018295d2..38961120a2 100644 --- a/talk/session/media/channelmanager_unittest.cc +++ b/talk/session/media/channelmanager_unittest.cc @@ -23,17 +23,17 @@ // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" #include "talk/media/base/fakecapturemanager.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/fakemediaprocessor.h" #include "talk/media/base/nullvideorenderer.h" -#include "talk/media/devices/fakedevicemanager.h" #include "talk/media/base/testutils.h" +#include "talk/media/devices/fakedevicemanager.h" #include "talk/p2p/base/fakesession.h" #include "talk/session/media/channelmanager.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/session/media/currentspeakermonitor.cc b/talk/session/media/currentspeakermonitor.cc index 900ec1e0ba..472acfedef 100644 --- a/talk/session/media/currentspeakermonitor.cc +++ b/talk/session/media/currentspeakermonitor.cc @@ -27,10 +27,10 @@ #include "talk/session/media/currentspeakermonitor.h" -#include "webrtc/base/logging.h" #include "talk/media/base/streamparams.h" #include "talk/session/media/audiomonitor.h" #include "talk/session/media/mediamessages.h" +#include "webrtc/base/logging.h" namespace cricket { diff --git a/talk/session/media/currentspeakermonitor_unittest.cc b/talk/session/media/currentspeakermonitor_unittest.cc index 8798f86f13..63676f982e 100644 --- a/talk/session/media/currentspeakermonitor_unittest.cc +++ b/talk/session/media/currentspeakermonitor_unittest.cc @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "talk/session/media/call.h" #include "talk/session/media/currentspeakermonitor.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/session/media/mediamessages.cc b/talk/session/media/mediamessages.cc index 933c1ee95f..1a5094eedb 100644 --- a/talk/session/media/mediamessages.cc +++ b/talk/session/media/mediamessages.cc @@ -31,12 +31,12 @@ #include "talk/session/media/mediamessages.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/parsing.h" #include "talk/session/media/mediasessionclient.h" #include "talk/xmllite/xmlelement.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringencode.h" namespace cricket { diff --git a/talk/session/media/mediamessages.h b/talk/session/media/mediamessages.h index 032bca8c6c..4a56e4b759 100644 --- a/talk/session/media/mediamessages.h +++ b/talk/session/media/mediamessages.h @@ -39,11 +39,11 @@ #include #include -#include "webrtc/base/basictypes.h" #include "talk/media/base/mediachannel.h" // For RtpHeaderExtension #include "talk/media/base/streamparams.h" #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/sessiondescription.h" +#include "webrtc/base/basictypes.h" namespace cricket { diff --git a/talk/session/media/mediamessages_unittest.cc b/talk/session/media/mediamessages_unittest.cc index 0700801f3f..c95053d9d5 100644 --- a/talk/session/media/mediamessages_unittest.cc +++ b/talk/session/media/mediamessages_unittest.cc @@ -30,11 +30,11 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/p2p/base/constants.h" #include "talk/session/media/mediasessionclient.h" #include "talk/xmllite/xmlelement.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/scoped_ptr.h" // Unit tests for mediamessages.cc. diff --git a/talk/session/media/mediamonitor.cc b/talk/session/media/mediamonitor.cc index 6c74bf9268..565e1459f7 100644 --- a/talk/session/media/mediamonitor.cc +++ b/talk/session/media/mediamonitor.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/common.h" #include "talk/session/media/channelmanager.h" #include "talk/session/media/mediamonitor.h" +#include "webrtc/base/common.h" namespace cricket { diff --git a/talk/session/media/mediamonitor.h b/talk/session/media/mediamonitor.h index 11dc419ed1..d549362ad7 100644 --- a/talk/session/media/mediamonitor.h +++ b/talk/session/media/mediamonitor.h @@ -30,10 +30,10 @@ #ifndef TALK_SESSION_MEDIA_MEDIAMONITOR_H_ #define TALK_SESSION_MEDIA_MEDIAMONITOR_H_ +#include "talk/media/base/mediachannel.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/thread.h" -#include "talk/media/base/mediachannel.h" namespace cricket { diff --git a/talk/session/media/mediarecorder.cc b/talk/session/media/mediarecorder.cc index 8d9d7e58e5..9ce84f3838 100644 --- a/talk/session/media/mediarecorder.cc +++ b/talk/session/media/mediarecorder.cc @@ -31,10 +31,10 @@ #include +#include "talk/media/base/rtpdump.h" #include "webrtc/base/fileutils.h" #include "webrtc/base/logging.h" #include "webrtc/base/pathutils.h" -#include "talk/media/base/rtpdump.h" namespace cricket { diff --git a/talk/session/media/mediarecorder.h b/talk/session/media/mediarecorder.h index aba6cf10fc..095f355c38 100644 --- a/talk/session/media/mediarecorder.h +++ b/talk/session/media/mediarecorder.h @@ -31,11 +31,11 @@ #include #include +#include "talk/session/media/channel.h" +#include "talk/session/media/mediasink.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslot.h" -#include "talk/session/media/channel.h" -#include "talk/session/media/mediasink.h" namespace rtc { class Pathname; diff --git a/talk/session/media/mediarecorder_unittest.cc b/talk/session/media/mediarecorder_unittest.cc index 2b3d892e26..9feb22aae6 100644 --- a/talk/session/media/mediarecorder_unittest.cc +++ b/talk/session/media/mediarecorder_unittest.cc @@ -25,17 +25,17 @@ #include -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/fileutils.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/pathutils.h" -#include "webrtc/base/thread.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/rtpdump.h" #include "talk/media/base/testutils.h" #include "talk/p2p/base/fakesession.h" #include "talk/session/media/channel.h" #include "talk/session/media/mediarecorder.h" +#include "webrtc/base/bytebuffer.h" +#include "webrtc/base/fileutils.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc index 7a5d6acffb..45e321f2a3 100644 --- a/talk/session/media/mediasession.cc +++ b/talk/session/media/mediasession.cc @@ -32,16 +32,16 @@ #include #include -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/constants.h" #include "talk/media/base/cryptoparams.h" #include "talk/p2p/base/constants.h" #include "talk/session/media/channelmanager.h" #include "talk/session/media/srtpfilter.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/stringutils.h" #ifdef HAVE_SCTP #include "talk/media/sctp/sctpdataengine.h" diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h index 514cf28d42..93894cd84c 100644 --- a/talk/session/media/mediasession.h +++ b/talk/session/media/mediasession.h @@ -30,11 +30,10 @@ #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_ #define TALK_SESSION_MEDIA_MEDIASESSION_H_ +#include #include #include -#include -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/codec.h" #include "talk/media/base/constants.h" #include "talk/media/base/cryptoparams.h" @@ -44,6 +43,7 @@ #include "talk/p2p/base/sessiondescription.h" #include "talk/p2p/base/transport.h" #include "talk/p2p/base/transportdescriptionfactory.h" +#include "webrtc/base/scoped_ptr.h" namespace cricket { diff --git a/talk/session/media/mediasession_unittest.cc b/talk/session/media/mediasession_unittest.cc index 5505fbb509..2d2e2c8211 100644 --- a/talk/session/media/mediasession_unittest.cc +++ b/talk/session/media/mediasession_unittest.cc @@ -28,10 +28,6 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/ssladapter.h" #include "talk/media/base/codec.h" #include "talk/media/base/testutils.h" #include "talk/p2p/base/constants.h" @@ -39,6 +35,10 @@ #include "talk/p2p/base/transportinfo.h" #include "talk/session/media/mediasession.h" #include "talk/session/media/srtpfilter.h" +#include "webrtc/base/fakesslidentity.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/messagedigest.h" +#include "webrtc/base/ssladapter.h" #ifdef HAVE_SRTP #define ASSERT_CRYPTO(cd, s, cs) \ diff --git a/talk/session/media/mediasessionclient.cc b/talk/session/media/mediasessionclient.cc index 8847c378c6..a1096b6801 100644 --- a/talk/session/media/mediasessionclient.cc +++ b/talk/session/media/mediasessionclient.cc @@ -29,12 +29,8 @@ #include "talk/session/media/mediasessionclient.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "talk/media/base/cryptoparams.h" #include "talk/media/base/capturemanager.h" +#include "talk/media/base/cryptoparams.h" #include "talk/media/sctp/sctpdataengine.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/parsing.h" @@ -43,6 +39,10 @@ #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" namespace cricket { diff --git a/talk/session/media/mediasessionclient.h b/talk/session/media/mediasessionclient.h index 33750fc310..61d1f1d13b 100644 --- a/talk/session/media/mediasessionclient.h +++ b/talk/session/media/mediasessionclient.h @@ -28,14 +28,10 @@ #ifndef TALK_SESSION_MEDIA_MEDIASESSIONCLIENT_H_ #define TALK_SESSION_MEDIA_MEDIASESSIONCLIENT_H_ +#include +#include #include #include -#include -#include -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sigslotrepeater.h" -#include "webrtc/base/thread.h" #include "talk/media/base/cryptoparams.h" #include "talk/p2p/base/session.h" #include "talk/p2p/base/sessionclient.h" @@ -44,6 +40,10 @@ #include "talk/session/media/call.h" #include "talk/session/media/channelmanager.h" #include "talk/session/media/mediasession.h" +#include "webrtc/base/messagequeue.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/sigslotrepeater.h" +#include "webrtc/base/thread.h" namespace cricket { diff --git a/talk/session/media/mediasessionclient_unittest.cc b/talk/session/media/mediasessionclient_unittest.cc index 98299d02d6..3e36b5a72f 100644 --- a/talk/session/media/mediasessionclient_unittest.cc +++ b/talk/session/media/mediasessionclient_unittest.cc @@ -28,9 +28,6 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/testutils.h" #include "talk/media/devices/fakedevicemanager.h" @@ -41,6 +38,9 @@ #include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlprinter.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" using cricket::AudioCodec; using cricket::AudioContentDescription; diff --git a/talk/session/media/planarfunctions_unittest.cc b/talk/session/media/planarfunctions_unittest.cc index 3eeb64f91d..e453087e89 100644 --- a/talk/session/media/planarfunctions_unittest.cc +++ b/talk/session/media/planarfunctions_unittest.cc @@ -31,11 +31,11 @@ #include "libyuv/format_conversion.h" #include "libyuv/mjpeg_decoder.h" #include "libyuv/planar_functions.h" +#include "talk/media/base/testutils.h" +#include "talk/media/base/videocommon.h" #include "webrtc/base/flags.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/media/base/testutils.h" -#include "talk/media/base/videocommon.h" // Undefine macros for the windows build. #undef max diff --git a/talk/session/media/rtcpmuxfilter.h b/talk/session/media/rtcpmuxfilter.h index 131c25bc5b..40951a2430 100644 --- a/talk/session/media/rtcpmuxfilter.h +++ b/talk/session/media/rtcpmuxfilter.h @@ -28,8 +28,8 @@ #ifndef TALK_SESSION_MEDIA_RTCPMUXFILTER_H_ #define TALK_SESSION_MEDIA_RTCPMUXFILTER_H_ -#include "webrtc/base/basictypes.h" #include "talk/p2p/base/sessiondescription.h" +#include "webrtc/base/basictypes.h" namespace cricket { diff --git a/talk/session/media/rtcpmuxfilter_unittest.cc b/talk/session/media/rtcpmuxfilter_unittest.cc index 9475b52a2f..a947bdf37d 100644 --- a/talk/session/media/rtcpmuxfilter_unittest.cc +++ b/talk/session/media/rtcpmuxfilter_unittest.cc @@ -25,8 +25,8 @@ #include "talk/session/media/rtcpmuxfilter.h" -#include "webrtc/base/gunit.h" #include "talk/media/base/testutils.h" +#include "webrtc/base/gunit.h" TEST(RtcpMuxFilterTest, DemuxRtcpSender) { cricket::RtcpMuxFilter filter; diff --git a/talk/session/media/soundclip.h b/talk/session/media/soundclip.h index 9d5e52113a..aaf85797d4 100644 --- a/talk/session/media/soundclip.h +++ b/talk/session/media/soundclip.h @@ -28,8 +28,8 @@ #ifndef TALK_SESSION_MEDIA_SOUNDCLIP_H_ #define TALK_SESSION_MEDIA_SOUNDCLIP_H_ -#include "webrtc/base/scoped_ptr.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/scoped_ptr.h" namespace rtc { diff --git a/talk/session/media/srtpfilter.cc b/talk/session/media/srtpfilter.cc index d189343259..c79bf1323a 100644 --- a/talk/session/media/srtpfilter.cc +++ b/talk/session/media/srtpfilter.cc @@ -33,11 +33,11 @@ #include +#include "talk/media/base/rtputils.h" #include "webrtc/base/base64.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/timeutils.h" -#include "talk/media/base/rtputils.h" // Enable this line to turn on SRTP debugging // #define SRTP_DEBUG diff --git a/talk/session/media/srtpfilter.h b/talk/session/media/srtpfilter.h index 51600236ad..ce3368f55b 100644 --- a/talk/session/media/srtpfilter.h +++ b/talk/session/media/srtpfilter.h @@ -33,11 +33,11 @@ #include #include +#include "talk/media/base/cryptoparams.h" +#include "talk/p2p/base/sessiondescription.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/sigslotrepeater.h" -#include "talk/media/base/cryptoparams.h" -#include "talk/p2p/base/sessiondescription.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; diff --git a/talk/session/media/srtpfilter_unittest.cc b/talk/session/media/srtpfilter_unittest.cc index 2cbe8eff09..19efa2a7b2 100644 --- a/talk/session/media/srtpfilter_unittest.cc +++ b/talk/session/media/srtpfilter_unittest.cc @@ -25,13 +25,13 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/byteorder.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "talk/media/base/cryptoparams.h" #include "talk/media/base/fakertp.h" #include "talk/p2p/base/sessiondescription.h" #include "talk/session/media/srtpfilter.h" +#include "webrtc/base/byteorder.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/thread.h" #ifdef SRTP_RELATIVE_PATH #include "crypto/include/err.h" #else diff --git a/talk/session/media/typingmonitor.cc b/talk/session/media/typingmonitor.cc index d37aabfd88..ee0f92a60a 100644 --- a/talk/session/media/typingmonitor.cc +++ b/talk/session/media/typingmonitor.cc @@ -27,9 +27,9 @@ #include "talk/session/media/typingmonitor.h" +#include "talk/session/media/channel.h" #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" -#include "talk/session/media/channel.h" namespace cricket { diff --git a/talk/session/media/typingmonitor.h b/talk/session/media/typingmonitor.h index 7d93e1b64e..4beb8ec0ee 100644 --- a/talk/session/media/typingmonitor.h +++ b/talk/session/media/typingmonitor.h @@ -28,8 +28,8 @@ #ifndef TALK_SESSION_MEDIA_TYPINGMONITOR_H_ #define TALK_SESSION_MEDIA_TYPINGMONITOR_H_ -#include "webrtc/base/messagehandler.h" #include "talk/media/base/mediachannel.h" +#include "webrtc/base/messagehandler.h" namespace rtc { class Thread; diff --git a/talk/session/media/typingmonitor_unittest.cc b/talk/session/media/typingmonitor_unittest.cc index e2ee3f4762..95fa7a4fb5 100644 --- a/talk/session/media/typingmonitor_unittest.cc +++ b/talk/session/media/typingmonitor_unittest.cc @@ -25,12 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/media/base/fakemediaengine.h" #include "talk/p2p/base/fakesession.h" #include "talk/session/media/channel.h" #include "talk/session/media/currentspeakermonitor.h" #include "talk/session/media/typingmonitor.h" +#include "webrtc/base/gunit.h" namespace cricket { diff --git a/talk/session/media/yuvscaler_unittest.cc b/talk/session/media/yuvscaler_unittest.cc index d732bb318e..20182467ae 100644 --- a/talk/session/media/yuvscaler_unittest.cc +++ b/talk/session/media/yuvscaler_unittest.cc @@ -29,11 +29,11 @@ #include "libyuv/cpu_id.h" #include "libyuv/scale.h" +#include "talk/media/base/testutils.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/flags.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/media/base/testutils.h" #if defined(_MSC_VER) #define ALIGN16(var) __declspec(align(16)) var diff --git a/talk/session/tunnel/pseudotcpchannel.cc b/talk/session/tunnel/pseudotcpchannel.cc index e407274fb5..f2776142e4 100644 --- a/talk/session/tunnel/pseudotcpchannel.cc +++ b/talk/session/tunnel/pseudotcpchannel.cc @@ -26,14 +26,14 @@ */ #include +#include "pseudotcpchannel.h" +#include "talk/p2p/base/candidate.h" +#include "talk/p2p/base/transportchannel.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringutils.h" -#include "talk/p2p/base/candidate.h" -#include "talk/p2p/base/transportchannel.h" -#include "pseudotcpchannel.h" using namespace rtc; diff --git a/talk/session/tunnel/pseudotcpchannel.h b/talk/session/tunnel/pseudotcpchannel.h index f8fe72ee1f..5ccfa4c3e4 100644 --- a/talk/session/tunnel/pseudotcpchannel.h +++ b/talk/session/tunnel/pseudotcpchannel.h @@ -28,11 +28,11 @@ #ifndef TALK_SESSION_TUNNEL_PSEUDOTCPCHANNEL_H_ #define TALK_SESSION_TUNNEL_PSEUDOTCPCHANNEL_H_ +#include "talk/p2p/base/pseudotcp.h" +#include "talk/p2p/base/session.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/stream.h" -#include "talk/p2p/base/pseudotcp.h" -#include "talk/p2p/base/session.h" namespace rtc { class Thread; diff --git a/talk/session/tunnel/securetunnelsessionclient.cc b/talk/session/tunnel/securetunnelsessionclient.cc index 743a762822..f4a33465bd 100644 --- a/talk/session/tunnel/securetunnelsessionclient.cc +++ b/talk/session/tunnel/securetunnelsessionclient.cc @@ -27,18 +27,18 @@ // SecureTunnelSessionClient and SecureTunnelSession implementation. +#include "talk/p2p/base/transportchannel.h" +#include "talk/session/tunnel/pseudotcpchannel.h" #include "talk/session/tunnel/securetunnelsessionclient.h" +#include "talk/xmllite/xmlelement.h" #include "webrtc/base/basicdefs.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/common.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" #include "webrtc/base/sslidentity.h" #include "webrtc/base/sslstreamadapter.h" -#include "talk/p2p/base/transportchannel.h" -#include "talk/xmllite/xmlelement.h" -#include "talk/session/tunnel/pseudotcpchannel.h" +#include "webrtc/base/stringutils.h" namespace cricket { diff --git a/talk/session/tunnel/securetunnelsessionclient.h b/talk/session/tunnel/securetunnelsessionclient.h index ef12c0792e..15202a1bf7 100644 --- a/talk/session/tunnel/securetunnelsessionclient.h +++ b/talk/session/tunnel/securetunnelsessionclient.h @@ -36,9 +36,9 @@ #include +#include "talk/session/tunnel/tunnelsessionclient.h" #include "webrtc/base/sslidentity.h" #include "webrtc/base/sslstreamadapter.h" -#include "talk/session/tunnel/tunnelsessionclient.h" namespace cricket { diff --git a/talk/session/tunnel/tunnelsessionclient.cc b/talk/session/tunnel/tunnelsessionclient.cc index d8d6e3e853..12275fb0b5 100644 --- a/talk/session/tunnel/tunnelsessionclient.cc +++ b/talk/session/tunnel/tunnelsessionclient.cc @@ -25,17 +25,17 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "pseudotcpchannel.h" +#include "talk/p2p/base/constants.h" +#include "talk/p2p/base/transportchannel.h" +#include "talk/xmllite/xmlelement.h" +#include "tunnelsessionclient.h" #include "webrtc/base/basicdefs.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/common.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" -#include "talk/p2p/base/constants.h" -#include "talk/p2p/base/transportchannel.h" -#include "talk/xmllite/xmlelement.h" -#include "pseudotcpchannel.h" -#include "tunnelsessionclient.h" namespace cricket { diff --git a/talk/session/tunnel/tunnelsessionclient.h b/talk/session/tunnel/tunnelsessionclient.h index 1d9b061f8e..ac12fafd7c 100644 --- a/talk/session/tunnel/tunnelsessionclient.h +++ b/talk/session/tunnel/tunnelsessionclient.h @@ -30,16 +30,16 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/stream.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/pseudotcp.h" #include "talk/p2p/base/session.h" +#include "talk/p2p/base/sessionclient.h" #include "talk/p2p/base/sessiondescription.h" #include "talk/p2p/base/sessionmanager.h" -#include "talk/p2p/base/sessionclient.h" #include "talk/xmllite/qname.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/criticalsection.h" +#include "webrtc/base/stream.h" namespace cricket { diff --git a/talk/session/tunnel/tunnelsessionclient_unittest.cc b/talk/session/tunnel/tunnelsessionclient_unittest.cc index bec0c6d2df..6d46918cc6 100644 --- a/talk/session/tunnel/tunnelsessionclient_unittest.cc +++ b/talk/session/tunnel/tunnelsessionclient_unittest.cc @@ -26,16 +26,16 @@ */ #include +#include "talk/p2p/base/sessionmanager.h" +#include "talk/p2p/base/transport.h" +#include "talk/p2p/client/fakeportallocator.h" +#include "talk/session/tunnel/tunnelsessionclient.h" #include "webrtc/base/gunit.h" #include "webrtc/base/messagehandler.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stream.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "talk/p2p/base/sessionmanager.h" -#include "talk/p2p/base/transport.h" -#include "talk/p2p/client/fakeportallocator.h" -#include "talk/session/tunnel/tunnelsessionclient.h" static const int kTimeoutMs = 10000; static const int kBlockSize = 4096; diff --git a/talk/sound/alsasoundsystem.cc b/talk/sound/alsasoundsystem.cc index fa0a0d9d57..d9960bb878 100644 --- a/talk/sound/alsasoundsystem.cc +++ b/talk/sound/alsasoundsystem.cc @@ -27,15 +27,15 @@ #include "talk/sound/alsasoundsystem.h" +#include "talk/sound/sounddevicelocator.h" +#include "talk/sound/soundinputstreaminterface.h" +#include "talk/sound/soundoutputstreaminterface.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/timeutils.h" #include "webrtc/base/worker.h" -#include "talk/sound/sounddevicelocator.h" -#include "talk/sound/soundinputstreaminterface.h" -#include "talk/sound/soundoutputstreaminterface.h" namespace cricket { diff --git a/talk/sound/alsasoundsystem.h b/talk/sound/alsasoundsystem.h index 1e0813588c..b3abfb0715 100644 --- a/talk/sound/alsasoundsystem.h +++ b/talk/sound/alsasoundsystem.h @@ -28,9 +28,9 @@ #ifndef TALK_SOUND_ALSASOUNDSYSTEM_H_ #define TALK_SOUND_ALSASOUNDSYSTEM_H_ -#include "webrtc/base/constructormagic.h" #include "talk/sound/alsasymboltable.h" #include "talk/sound/soundsysteminterface.h" +#include "webrtc/base/constructormagic.h" namespace cricket { diff --git a/talk/sound/automaticallychosensoundsystem.h b/talk/sound/automaticallychosensoundsystem.h index afe62c3ce0..10ea0dfb25 100644 --- a/talk/sound/automaticallychosensoundsystem.h +++ b/talk/sound/automaticallychosensoundsystem.h @@ -28,11 +28,11 @@ #ifndef TALK_SOUND_AUTOMATICALLYCHOSENSOUNDSYSTEM_H_ #define TALK_SOUND_AUTOMATICALLYCHOSENSOUNDSYSTEM_H_ +#include "talk/sound/soundsysteminterface.h" +#include "talk/sound/soundsystemproxy.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/sound/soundsysteminterface.h" -#include "talk/sound/soundsystemproxy.h" namespace cricket { diff --git a/talk/sound/automaticallychosensoundsystem_unittest.cc b/talk/sound/automaticallychosensoundsystem_unittest.cc index a57b283876..813828d689 100644 --- a/talk/sound/automaticallychosensoundsystem_unittest.cc +++ b/talk/sound/automaticallychosensoundsystem_unittest.cc @@ -25,9 +25,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/gunit.h" #include "talk/sound/automaticallychosensoundsystem.h" #include "talk/sound/nullsoundsystem.h" +#include "webrtc/base/gunit.h" namespace cricket { diff --git a/talk/sound/nullsoundsystem.cc b/talk/sound/nullsoundsystem.cc index fc16ccbabd..3408d4c8b8 100644 --- a/talk/sound/nullsoundsystem.cc +++ b/talk/sound/nullsoundsystem.cc @@ -27,10 +27,10 @@ #include "talk/sound/nullsoundsystem.h" -#include "webrtc/base/logging.h" #include "talk/sound/sounddevicelocator.h" #include "talk/sound/soundinputstreaminterface.h" #include "talk/sound/soundoutputstreaminterface.h" +#include "webrtc/base/logging.h" namespace rtc { diff --git a/talk/sound/pulseaudiosoundsystem.cc b/talk/sound/pulseaudiosoundsystem.cc index 1ffb24b0f8..24eea5c9fb 100644 --- a/talk/sound/pulseaudiosoundsystem.cc +++ b/talk/sound/pulseaudiosoundsystem.cc @@ -29,14 +29,14 @@ #ifdef HAVE_LIBPULSE -#include "webrtc/base/common.h" -#include "webrtc/base/fileutils.h" // for GetApplicationName() -#include "webrtc/base/logging.h" -#include "webrtc/base/worker.h" -#include "webrtc/base/timeutils.h" #include "talk/sound/sounddevicelocator.h" #include "talk/sound/soundinputstreaminterface.h" #include "talk/sound/soundoutputstreaminterface.h" +#include "webrtc/base/common.h" +#include "webrtc/base/fileutils.h" // for GetApplicationName() +#include "webrtc/base/logging.h" +#include "webrtc/base/timeutils.h" +#include "webrtc/base/worker.h" namespace cricket { diff --git a/talk/sound/pulseaudiosoundsystem.h b/talk/sound/pulseaudiosoundsystem.h index 53b950709b..16938d61c3 100644 --- a/talk/sound/pulseaudiosoundsystem.h +++ b/talk/sound/pulseaudiosoundsystem.h @@ -30,9 +30,9 @@ #ifdef HAVE_LIBPULSE -#include "webrtc/base/constructormagic.h" #include "talk/sound/pulseaudiosymboltable.h" #include "talk/sound/soundsysteminterface.h" +#include "webrtc/base/constructormagic.h" namespace cricket { diff --git a/talk/sound/soundsystemproxy.h b/talk/sound/soundsystemproxy.h index 0570704cdb..0b8a3da7e4 100644 --- a/talk/sound/soundsystemproxy.h +++ b/talk/sound/soundsystemproxy.h @@ -28,8 +28,8 @@ #ifndef TALK_SOUND_SOUNDSYSTEMPROXY_H_ #define TALK_SOUND_SOUNDSYSTEMPROXY_H_ -#include "webrtc/base/basictypes.h" // for NULL #include "talk/sound/soundsysteminterface.h" +#include "webrtc/base/basictypes.h" // for NULL namespace cricket { diff --git a/talk/xmllite/qname_unittest.cc b/talk/xmllite/qname_unittest.cc index 7ae27fb3b2..72c171362e 100644 --- a/talk/xmllite/qname_unittest.cc +++ b/talk/xmllite/qname_unittest.cc @@ -26,8 +26,8 @@ */ #include -#include "webrtc/base/gunit.h" #include "talk/xmllite/qname.h" +#include "webrtc/base/gunit.h" using buzz::StaticQName; using buzz::QName; diff --git a/talk/xmllite/xmlbuilder.cc b/talk/xmllite/xmlbuilder.cc index e923a3d3cc..a091ed944e 100644 --- a/talk/xmllite/xmlbuilder.cc +++ b/talk/xmllite/xmlbuilder.cc @@ -27,11 +27,11 @@ #include "talk/xmllite/xmlbuilder.h" -#include #include -#include "webrtc/base/common.h" +#include #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmllite/xmlbuilder.h b/talk/xmllite/xmlbuilder.h index a80773ed38..38fc009fb3 100644 --- a/talk/xmllite/xmlbuilder.h +++ b/talk/xmllite/xmlbuilder.h @@ -30,8 +30,8 @@ #include #include -#include "webrtc/base/scoped_ptr.h" #include "talk/xmllite/xmlparser.h" +#include "webrtc/base/scoped_ptr.h" #ifdef EXPAT_RELATIVE_PATH #include "expat.h" diff --git a/talk/xmllite/xmlbuilder_unittest.cc b/talk/xmllite/xmlbuilder_unittest.cc index 0f0c1e5900..56304cf49d 100644 --- a/talk/xmllite/xmlbuilder_unittest.cc +++ b/talk/xmllite/xmlbuilder_unittest.cc @@ -25,14 +25,14 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" +#include +#include #include "talk/xmllite/xmlbuilder.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlparser.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" using buzz::XmlBuilder; using buzz::XmlElement; diff --git a/talk/xmllite/xmlelement.cc b/talk/xmllite/xmlelement.cc index d8fb1e86f5..d76d0f57a9 100644 --- a/talk/xmllite/xmlelement.cc +++ b/talk/xmllite/xmlelement.cc @@ -32,12 +32,12 @@ #include #include -#include "webrtc/base/common.h" #include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlparser.h" #include "talk/xmllite/xmlbuilder.h" -#include "talk/xmllite/xmlprinter.h" #include "talk/xmllite/xmlconstants.h" +#include "talk/xmllite/xmlparser.h" +#include "talk/xmllite/xmlprinter.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmllite/xmlelement.h b/talk/xmllite/xmlelement.h index cdb6873bc7..044d2c404d 100644 --- a/talk/xmllite/xmlelement.h +++ b/talk/xmllite/xmlelement.h @@ -31,8 +31,8 @@ #include #include -#include "webrtc/base/scoped_ptr.h" #include "talk/xmllite/qname.h" +#include "webrtc/base/scoped_ptr.h" namespace buzz { diff --git a/talk/xmllite/xmlelement_unittest.cc b/talk/xmllite/xmlelement_unittest.cc index 88b0a405dd..5b2e1067b5 100644 --- a/talk/xmllite/xmlelement_unittest.cc +++ b/talk/xmllite/xmlelement_unittest.cc @@ -25,13 +25,13 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include +#include +#include +#include "talk/xmllite/xmlelement.h" #include "webrtc/base/common.h" #include "webrtc/base/gunit.h" #include "webrtc/base/thread.h" -#include "talk/xmllite/xmlelement.h" using buzz::QName; using buzz::XmlAttr; diff --git a/talk/xmllite/xmlnsstack.cc b/talk/xmllite/xmlnsstack.cc index 26e27f8092..bc66b4f508 100644 --- a/talk/xmllite/xmlnsstack.cc +++ b/talk/xmllite/xmlnsstack.cc @@ -31,8 +31,8 @@ #include #include -#include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlconstants.h" +#include "talk/xmllite/xmlelement.h" namespace buzz { diff --git a/talk/xmllite/xmlnsstack.h b/talk/xmllite/xmlnsstack.h index 3acc7d4921..a3c4368ac5 100644 --- a/talk/xmllite/xmlnsstack.h +++ b/talk/xmllite/xmlnsstack.h @@ -30,8 +30,8 @@ #include #include -#include "webrtc/base/scoped_ptr.h" #include "talk/xmllite/qname.h" +#include "webrtc/base/scoped_ptr.h" namespace buzz { diff --git a/talk/xmllite/xmlnsstack_unittest.cc b/talk/xmllite/xmlnsstack_unittest.cc index 4dc90427d2..82a39dd074 100644 --- a/talk/xmllite/xmlnsstack_unittest.cc +++ b/talk/xmllite/xmlnsstack_unittest.cc @@ -27,13 +27,13 @@ #include "talk/xmllite/xmlnsstack.h" -#include -#include #include +#include +#include +#include "talk/xmllite/xmlconstants.h" #include "webrtc/base/common.h" #include "webrtc/base/gunit.h" -#include "talk/xmllite/xmlconstants.h" using buzz::NS_XML; using buzz::NS_XMLNS; diff --git a/talk/xmllite/xmlparser.cc b/talk/xmllite/xmlparser.cc index f12040fe4e..c985b1f11a 100644 --- a/talk/xmllite/xmlparser.cc +++ b/talk/xmllite/xmlparser.cc @@ -30,11 +30,11 @@ #include #include -#include "webrtc/base/common.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlnsstack.h" #include "talk/xmllite/xmlnsstack.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmllite/xmlparser_unittest.cc b/talk/xmllite/xmlparser_unittest.cc index ae0867e471..322f8be76e 100644 --- a/talk/xmllite/xmlparser_unittest.cc +++ b/talk/xmllite/xmlparser_unittest.cc @@ -25,13 +25,13 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" +#include +#include #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlparser.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" using buzz::QName; using buzz::XmlParser; diff --git a/talk/xmllite/xmlprinter_unittest.cc b/talk/xmllite/xmlprinter_unittest.cc index 309e507693..7100025ddd 100644 --- a/talk/xmllite/xmlprinter_unittest.cc +++ b/talk/xmllite/xmlprinter_unittest.cc @@ -30,11 +30,11 @@ #include #include -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlnsstack.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" using buzz::QName; using buzz::XmlElement; diff --git a/talk/xmpp/asyncsocket.h b/talk/xmpp/asyncsocket.h index e31e29e1e4..5e83b63057 100644 --- a/talk/xmpp/asyncsocket.h +++ b/talk/xmpp/asyncsocket.h @@ -28,6 +28,8 @@ #ifndef _ASYNCSOCKET_H_ #define _ASYNCSOCKET_H_ +#include + #include "webrtc/base/sigslot.h" namespace rtc { diff --git a/talk/xmpp/chatroommodule_unittest.cc b/talk/xmpp/chatroommodule_unittest.cc index 8c0c662c35..400a2dd8ec 100644 --- a/talk/xmpp/chatroommodule_unittest.cc +++ b/talk/xmpp/chatroommodule_unittest.cc @@ -25,17 +25,17 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include -#include "common/common.h" -#include "buzz/xmppengine.h" -#include "buzz/xmlelement.h" +#include +#include #include "buzz/chatroommodule.h" #include "buzz/constants.h" +#include "buzz/xmlelement.h" +#include "buzz/xmppengine.h" +#include "common/common.h" #include "engine/util_unittest.h" -#include "test/unittest.h" #include "test/unittest-inl.h" +#include "test/unittest.h" #define TEST_OK(x) TEST_EQ((x),XMPP_RETURN_OK) #define TEST_BADARGUMENT(x) TEST_EQ((x),XMPP_RETURN_BADARGUMENT) diff --git a/talk/xmpp/chatroommoduleimpl.cc b/talk/xmpp/chatroommoduleimpl.cc index 6e94f28763..45db014c62 100644 --- a/talk/xmpp/chatroommoduleimpl.cc +++ b/talk/xmpp/chatroommoduleimpl.cc @@ -25,16 +25,16 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include #include -#include #include -#include "webrtc/base/common.h" +#include +#include +#include +#include +#include "talk/xmpp/chatroommodule.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/moduleimpl.h" -#include "talk/xmpp/chatroommodule.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmpp/constants.cc b/talk/xmpp/constants.cc index 964d5c11ee..a2179cad13 100644 --- a/talk/xmpp/constants.cc +++ b/talk/xmpp/constants.cc @@ -29,11 +29,11 @@ #include -#include "webrtc/base/basicdefs.h" +#include "talk/xmllite/qname.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" #include "talk/xmpp/jid.h" +#include "webrtc/base/basicdefs.h" namespace buzz { diff --git a/talk/xmpp/discoitemsquerytask.cc b/talk/xmpp/discoitemsquerytask.cc index 3671cb4245..d900b8503a 100644 --- a/talk/xmpp/discoitemsquerytask.cc +++ b/talk/xmpp/discoitemsquerytask.cc @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/scoped_ptr.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/discoitemsquerytask.h" #include "talk/xmpp/xmpptask.h" +#include "webrtc/base/scoped_ptr.h" namespace buzz { diff --git a/talk/xmpp/hangoutpubsubclient.cc b/talk/xmpp/hangoutpubsubclient.cc index 63baeccf0d..834f844f89 100644 --- a/talk/xmpp/hangoutpubsubclient.cc +++ b/talk/xmpp/hangoutpubsubclient.cc @@ -27,11 +27,11 @@ #include "talk/xmpp/hangoutpubsubclient.h" -#include "webrtc/base/logging.h" -#include "talk/xmpp/constants.h" -#include "talk/xmpp/jid.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" +#include "talk/xmpp/constants.h" +#include "talk/xmpp/jid.h" +#include "webrtc/base/logging.h" // Gives a high-level API for MUC call PubSub needs such as diff --git a/talk/xmpp/hangoutpubsubclient.h b/talk/xmpp/hangoutpubsubclient.h index 3842c475ee..5692fc6676 100644 --- a/talk/xmpp/hangoutpubsubclient.h +++ b/talk/xmpp/hangoutpubsubclient.h @@ -32,12 +32,12 @@ #include #include -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sigslotrepeater.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubclient.h" #include "talk/xmpp/pubsubstateclient.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/sigslotrepeater.h" // Gives a high-level API for MUC call PubSub needs such as // presenter state, recording state, mute state, and remote mute. diff --git a/talk/xmpp/hangoutpubsubclient_unittest.cc b/talk/xmpp/hangoutpubsubclient_unittest.cc index 5e8b852e86..c12b7916a1 100644 --- a/talk/xmpp/hangoutpubsubclient_unittest.cc +++ b/talk/xmpp/hangoutpubsubclient_unittest.cc @@ -3,15 +3,15 @@ #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" -#include "talk/xmpp/jid.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/hangoutpubsubclient.h" +#include "talk/xmpp/jid.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class TestHangoutPubSubListener : public sigslot::has_slots<> { public: diff --git a/talk/xmpp/iqtask.cc b/talk/xmpp/iqtask.cc index f54f630413..f6a21d4784 100644 --- a/talk/xmpp/iqtask.cc +++ b/talk/xmpp/iqtask.cc @@ -27,8 +27,8 @@ #include "talk/xmpp/iqtask.h" -#include "talk/xmpp/xmppclient.h" #include "talk/xmpp/constants.h" +#include "talk/xmpp/xmppclient.h" namespace buzz { diff --git a/talk/xmpp/iqtask.h b/talk/xmpp/iqtask.h index 34a62b1c9a..312c4af5f2 100644 --- a/talk/xmpp/iqtask.h +++ b/talk/xmpp/iqtask.h @@ -30,8 +30,8 @@ #include -#include "talk/xmpp/xmpptask.h" #include "talk/xmpp/xmppengine.h" +#include "talk/xmpp/xmpptask.h" namespace buzz { diff --git a/talk/xmpp/jid.cc b/talk/xmpp/jid.cc index 3a19e05708..702e477dd6 100644 --- a/talk/xmpp/jid.cc +++ b/talk/xmpp/jid.cc @@ -32,9 +32,9 @@ #include #include +#include "talk/xmpp/constants.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "talk/xmpp/constants.h" namespace buzz { diff --git a/talk/xmpp/jid.h b/talk/xmpp/jid.h index 309048b5fd..7a6370ca24 100644 --- a/talk/xmpp/jid.h +++ b/talk/xmpp/jid.h @@ -29,8 +29,8 @@ #define TALK_XMPP_JID_H_ #include -#include "webrtc/base/basictypes.h" #include "talk/xmllite/xmlconstants.h" +#include "webrtc/base/basictypes.h" namespace buzz { diff --git a/talk/xmpp/jid_unittest.cc b/talk/xmpp/jid_unittest.cc index c728bee900..05835cf83d 100644 --- a/talk/xmpp/jid_unittest.cc +++ b/talk/xmpp/jid_unittest.cc @@ -1,8 +1,8 @@ // Copyright 2004 Google Inc. All Rights Reserved -#include "webrtc/base/gunit.h" #include "talk/xmpp/jid.h" +#include "webrtc/base/gunit.h" using buzz::Jid; diff --git a/talk/xmpp/jingleinfotask.cc b/talk/xmpp/jingleinfotask.cc index 9727d96072..3ceae07ba1 100644 --- a/talk/xmpp/jingleinfotask.cc +++ b/talk/xmpp/jingleinfotask.cc @@ -27,10 +27,10 @@ #include "talk/xmpp/jingleinfotask.h" -#include "webrtc/base/socketaddress.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmpptask.h" +#include "webrtc/base/socketaddress.h" namespace buzz { diff --git a/talk/xmpp/module.h b/talk/xmpp/module.h index 75a190d894..37396ef072 100644 --- a/talk/xmpp/module.h +++ b/talk/xmpp/module.h @@ -28,10 +28,11 @@ #ifndef _module_h_ #define _module_h_ +#include "talk/xmpp/xmppengine.h" + namespace buzz { class XmppEngine; -enum XmppReturnStatus; //! This is the base class for extension modules. //! An engine is registered with the module and the module then hooks the diff --git a/talk/xmpp/moduleimpl.cc b/talk/xmpp/moduleimpl.cc index 66a1eb1608..4635bee70a 100644 --- a/talk/xmpp/moduleimpl.cc +++ b/talk/xmpp/moduleimpl.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/common.h" #include "talk/xmpp/moduleimpl.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmpp/moduleimpl.h b/talk/xmpp/moduleimpl.h index 085c83a0d8..32a182b99a 100644 --- a/talk/xmpp/moduleimpl.h +++ b/talk/xmpp/moduleimpl.h @@ -28,8 +28,8 @@ #ifndef _moduleimpl_h_ #define _moduleimpl_h_ -#include "talk/xmpp/xmppengine.h" #include "talk/xmpp/module.h" +#include "talk/xmpp/xmppengine.h" namespace buzz { diff --git a/talk/xmpp/mucroomconfigtask.cc b/talk/xmpp/mucroomconfigtask.cc index dded3a68a4..536eb9bf2f 100644 --- a/talk/xmpp/mucroomconfigtask.cc +++ b/talk/xmpp/mucroomconfigtask.cc @@ -30,8 +30,8 @@ #include "talk/xmpp/mucroomconfigtask.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/scoped_ptr.h" namespace buzz { diff --git a/talk/xmpp/mucroomconfigtask_unittest.cc b/talk/xmpp/mucroomconfigtask_unittest.cc index 575c1638e7..00a9c6edfb 100644 --- a/talk/xmpp/mucroomconfigtask_unittest.cc +++ b/talk/xmpp/mucroomconfigtask_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomconfigtask.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class MucRoomConfigListener : public sigslot::has_slots<> { public: diff --git a/talk/xmpp/mucroomdiscoverytask_unittest.cc b/talk/xmpp/mucroomdiscoverytask_unittest.cc index 32c7cd2532..ef7e477d6c 100644 --- a/talk/xmpp/mucroomdiscoverytask_unittest.cc +++ b/talk/xmpp/mucroomdiscoverytask_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomdiscoverytask.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class MucRoomDiscoveryListener : public sigslot::has_slots<> { public: diff --git a/talk/xmpp/mucroomlookuptask.cc b/talk/xmpp/mucroomlookuptask.cc index 5caa598511..8e1895c68e 100644 --- a/talk/xmpp/mucroomlookuptask.cc +++ b/talk/xmpp/mucroomlookuptask.cc @@ -27,9 +27,9 @@ #include "talk/xmpp/mucroomlookuptask.h" +#include "talk/xmpp/constants.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/xmpp/constants.h" namespace buzz { diff --git a/talk/xmpp/mucroomlookuptask_unittest.cc b/talk/xmpp/mucroomlookuptask_unittest.cc index 9af0e4b612..341fd3fed2 100644 --- a/talk/xmpp/mucroomlookuptask_unittest.cc +++ b/talk/xmpp/mucroomlookuptask_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomlookuptask.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class MucRoomLookupListener : public sigslot::has_slots<> { public: diff --git a/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc b/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc index 35931ae085..5cabcbe16d 100644 --- a/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc +++ b/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomuniquehangoutidtask.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class MucRoomUniqueHangoutIdListener : public sigslot::has_slots<> { public: diff --git a/talk/xmpp/pingtask.cc b/talk/xmpp/pingtask.cc index bf6eea28f1..7922ea04ca 100644 --- a/talk/xmpp/pingtask.cc +++ b/talk/xmpp/pingtask.cc @@ -3,9 +3,9 @@ #include "talk/xmpp/pingtask.h" +#include "talk/xmpp/constants.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/xmpp/constants.h" namespace buzz { diff --git a/talk/xmpp/pingtask.h b/talk/xmpp/pingtask.h index 1bd1514236..2a869a3a74 100644 --- a/talk/xmpp/pingtask.h +++ b/talk/xmpp/pingtask.h @@ -28,9 +28,9 @@ #ifndef TALK_XMPP_PINGTASK_H_ #define TALK_XMPP_PINGTASK_H_ +#include "talk/xmpp/xmpptask.h" #include "webrtc/base/messagehandler.h" #include "webrtc/base/messagequeue.h" -#include "talk/xmpp/xmpptask.h" namespace buzz { diff --git a/talk/xmpp/pingtask_unittest.cc b/talk/xmpp/pingtask_unittest.cc index ef41670715..ce595a85c0 100644 --- a/talk/xmpp/pingtask_unittest.cc +++ b/talk/xmpp/pingtask_unittest.cc @@ -28,13 +28,13 @@ #include #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/pingtask.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" class PingTaskTest; diff --git a/talk/xmpp/plainsaslhandler.h b/talk/xmpp/plainsaslhandler.h index 8d34f5e07e..2ca364c737 100644 --- a/talk/xmpp/plainsaslhandler.h +++ b/talk/xmpp/plainsaslhandler.h @@ -28,8 +28,10 @@ #ifndef _PLAINSASLHANDLER_H_ #define _PLAINSASLHANDLER_H_ -#include "talk/xmpp/saslhandler.h" #include +#include "talk/xmpp/saslhandler.h" +#include "talk/xmpp/saslplainmechanism.h" +#include "webrtc/base/cryptstring.h" namespace buzz { @@ -77,4 +79,3 @@ private: } #endif - diff --git a/talk/xmpp/presenceouttask.cc b/talk/xmpp/presenceouttask.cc index 2974edcd8a..a77d9d6c6b 100644 --- a/talk/xmpp/presenceouttask.cc +++ b/talk/xmpp/presenceouttask.cc @@ -27,10 +27,10 @@ #include #include -#include "webrtc/base/stringencode.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/presenceouttask.h" #include "talk/xmpp/xmppclient.h" +#include "webrtc/base/stringencode.h" namespace buzz { diff --git a/talk/xmpp/presenceouttask.h b/talk/xmpp/presenceouttask.h index cea2b564ca..a72457e987 100644 --- a/talk/xmpp/presenceouttask.h +++ b/talk/xmpp/presenceouttask.h @@ -28,9 +28,9 @@ #ifndef _PRESENCEOUTTASK_H_ #define _PRESENCEOUTTASK_H_ +#include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/xmpp/presencestatus.h" namespace buzz { diff --git a/talk/xmpp/presencereceivetask.cc b/talk/xmpp/presencereceivetask.cc index 3a21ea7393..940c53b693 100644 --- a/talk/xmpp/presencereceivetask.cc +++ b/talk/xmpp/presencereceivetask.cc @@ -27,8 +27,8 @@ #include "talk/xmpp/presencereceivetask.h" -#include "webrtc/base/stringencode.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/stringencode.h" namespace buzz { diff --git a/talk/xmpp/presencestatus.h b/talk/xmpp/presencestatus.h index 5cf6b61362..45c5471292 100644 --- a/talk/xmpp/presencestatus.h +++ b/talk/xmpp/presencestatus.h @@ -28,8 +28,8 @@ #ifndef THIRD_PARTY_LIBJINGLE_FILES_TALK_XMPP_PRESENCESTATUS_H_ #define THIRD_PARTY_LIBJINGLE_FILES_TALK_XMPP_PRESENCESTATUS_H_ -#include "talk/xmpp/jid.h" #include "talk/xmpp/constants.h" +#include "talk/xmpp/jid.h" namespace buzz { diff --git a/talk/xmpp/prexmppauth.h b/talk/xmpp/prexmppauth.h index 83de5a47f8..71fcae4134 100644 --- a/talk/xmpp/prexmppauth.h +++ b/talk/xmpp/prexmppauth.h @@ -28,9 +28,9 @@ #ifndef TALK_XMPP_PREXMPPAUTH_H_ #define TALK_XMPP_PREXMPPAUTH_H_ +#include "talk/xmpp/saslhandler.h" #include "webrtc/base/cryptstring.h" #include "webrtc/base/sigslot.h" -#include "talk/xmpp/saslhandler.h" namespace rtc { class SocketAddress; diff --git a/talk/xmpp/pubsub_task.cc b/talk/xmpp/pubsub_task.cc index 36184c6930..3552764a92 100644 --- a/talk/xmpp/pubsub_task.cc +++ b/talk/xmpp/pubsub_task.cc @@ -30,9 +30,9 @@ #include #include -#include "webrtc/base/common.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/xmppengine.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmpp/pubsubclient.h b/talk/xmpp/pubsubclient.h index 3212119523..d7b5066ae5 100644 --- a/talk/xmpp/pubsubclient.h +++ b/talk/xmpp/pubsubclient.h @@ -31,11 +31,11 @@ #include #include +#include "talk/xmpp/jid.h" +#include "talk/xmpp/pubsubtasks.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/sigslotrepeater.h" #include "webrtc/base/task.h" -#include "talk/xmpp/jid.h" -#include "talk/xmpp/pubsubtasks.h" // Easy to use clients built on top of the tasks for XEP-0060 // (http://xmpp.org/extensions/xep-0060.html). diff --git a/talk/xmpp/pubsubclient_unittest.cc b/talk/xmpp/pubsubclient_unittest.cc index 01dec5fe1d..135dc37e46 100644 --- a/talk/xmpp/pubsubclient_unittest.cc +++ b/talk/xmpp/pubsubclient_unittest.cc @@ -3,15 +3,15 @@ #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubclient.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" struct HandledPubSubItem { std::string itemid; diff --git a/talk/xmpp/pubsubstateclient.h b/talk/xmpp/pubsubstateclient.h index 17f4097b47..2acbdaa392 100644 --- a/talk/xmpp/pubsubstateclient.h +++ b/talk/xmpp/pubsubstateclient.h @@ -32,14 +32,14 @@ #include #include -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sigslotrepeater.h" +#include "talk/xmllite/qname.h" +#include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubclient.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/sigslotrepeater.h" namespace buzz { diff --git a/talk/xmpp/pubsubtasks.h b/talk/xmpp/pubsubtasks.h index 381667b84b..94be276a48 100644 --- a/talk/xmpp/pubsubtasks.h +++ b/talk/xmpp/pubsubtasks.h @@ -30,9 +30,9 @@ #include -#include "webrtc/base/sigslot.h" #include "talk/xmpp/iqtask.h" #include "talk/xmpp/receivetask.h" +#include "webrtc/base/sigslot.h" namespace buzz { diff --git a/talk/xmpp/pubsubtasks_unittest.cc b/talk/xmpp/pubsubtasks_unittest.cc index bcfc6967d3..98cb7c1903 100644 --- a/talk/xmpp/pubsubtasks_unittest.cc +++ b/talk/xmpp/pubsubtasks_unittest.cc @@ -3,16 +3,16 @@ #include -#include "webrtc/base/faketaskrunner.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" -#include "talk/xmpp/iqtask.h" #include "talk/xmpp/fakexmppclient.h" +#include "talk/xmpp/iqtask.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubtasks.h" +#include "webrtc/base/faketaskrunner.h" +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" struct HandledPubSubItem { std::string itemid; diff --git a/talk/xmpp/receivetask.cc b/talk/xmpp/receivetask.cc index 53fac7e9d0..c2fb244efc 100644 --- a/talk/xmpp/receivetask.cc +++ b/talk/xmpp/receivetask.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/receivetask.h" #include "talk/xmpp/constants.h" +#include "talk/xmpp/receivetask.h" namespace buzz { diff --git a/talk/xmpp/rostermodule_unittest.cc b/talk/xmpp/rostermodule_unittest.cc index 4dbcabbd66..0e2b268211 100644 --- a/talk/xmpp/rostermodule_unittest.cc +++ b/talk/xmpp/rostermodule_unittest.cc @@ -25,17 +25,17 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include +#include +#include +#include "talk/xmllite/xmlelement.h" +#include "talk/xmpp/constants.h" +#include "talk/xmpp/rostermodule.h" +#include "talk/xmpp/util_unittest.h" +#include "talk/xmpp/xmppengine.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" -#include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/xmppengine.h" -#include "talk/xmpp/rostermodule.h" -#include "talk/xmpp/constants.h" -#include "talk/xmpp/util_unittest.h" #define TEST_OK(x) EXPECT_EQ((x),XMPP_RETURN_OK) #define TEST_BADARGUMENT(x) EXPECT_EQ((x),XMPP_RETURN_BADARGUMENT) diff --git a/talk/xmpp/rostermoduleimpl.cc b/talk/xmpp/rostermoduleimpl.cc index 0ebf7e9ecc..e52e78e359 100644 --- a/talk/xmpp/rostermoduleimpl.cc +++ b/talk/xmpp/rostermoduleimpl.cc @@ -25,16 +25,16 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include #include -#include #include -#include "webrtc/base/common.h" -#include "webrtc/base/stringencode.h" +#include +#include +#include +#include #include "talk/xmpp/constants.h" #include "talk/xmpp/rostermoduleimpl.h" +#include "webrtc/base/common.h" +#include "webrtc/base/stringencode.h" namespace buzz { diff --git a/talk/xmpp/saslcookiemechanism.h b/talk/xmpp/saslcookiemechanism.h index ded9e9716f..7a19d3e201 100644 --- a/talk/xmpp/saslcookiemechanism.h +++ b/talk/xmpp/saslcookiemechanism.h @@ -30,8 +30,8 @@ #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/saslmechanism.h" #include "talk/xmpp/constants.h" +#include "talk/xmpp/saslmechanism.h" namespace buzz { diff --git a/talk/xmpp/saslmechanism.cc b/talk/xmpp/saslmechanism.cc index 77ffe9c768..488007c2ee 100644 --- a/talk/xmpp/saslmechanism.cc +++ b/talk/xmpp/saslmechanism.cc @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/base/base64.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslmechanism.h" +#include "webrtc/base/base64.h" using rtc::Base64; diff --git a/talk/xmpp/saslplainmechanism.h b/talk/xmpp/saslplainmechanism.h index 3491a930f9..36b9bb9bcd 100644 --- a/talk/xmpp/saslplainmechanism.h +++ b/talk/xmpp/saslplainmechanism.h @@ -28,8 +28,8 @@ #ifndef TALK_XMPP_SASLPLAINMECHANISM_H_ #define TALK_XMPP_SASLPLAINMECHANISM_H_ -#include "webrtc/base/cryptstring.h" #include "talk/xmpp/saslmechanism.h" +#include "webrtc/base/cryptstring.h" namespace buzz { diff --git a/talk/xmpp/util_unittest.cc b/talk/xmpp/util_unittest.cc index 390e7bccbc..66fb5ef8d7 100644 --- a/talk/xmpp/util_unittest.cc +++ b/talk/xmpp/util_unittest.cc @@ -1,13 +1,13 @@ // Copyright 2004 Google, Inc. All Rights Reserved. // Author: Joe Beda -#include -#include #include -#include "webrtc/base/gunit.h" +#include +#include #include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/xmppengine.h" #include "talk/xmpp/util_unittest.h" +#include "talk/xmpp/xmppengine.h" +#include "webrtc/base/gunit.h" namespace buzz { diff --git a/talk/xmpp/util_unittest.h b/talk/xmpp/util_unittest.h index bb0656c120..c9377ffc6e 100644 --- a/talk/xmpp/util_unittest.h +++ b/talk/xmpp/util_unittest.h @@ -28,8 +28,8 @@ #ifndef TALK_XMPP_UTIL_UNITTEST_H_ #define TALK_XMPP_UTIL_UNITTEST_H_ -#include #include +#include #include "talk/xmpp/xmppengine.h" namespace buzz { diff --git a/talk/xmpp/xmppauth.h b/talk/xmpp/xmppauth.h index 504b11e863..fec73e6128 100644 --- a/talk/xmpp/xmppauth.h +++ b/talk/xmpp/xmppauth.h @@ -30,11 +30,11 @@ #include +#include "talk/xmpp/jid.h" +#include "talk/xmpp/prexmppauth.h" +#include "talk/xmpp/saslhandler.h" #include "webrtc/base/cryptstring.h" #include "webrtc/base/sigslot.h" -#include "talk/xmpp/jid.h" -#include "talk/xmpp/saslhandler.h" -#include "talk/xmpp/prexmppauth.h" class XmppAuth: public buzz::PreXmppAuth { public: diff --git a/talk/xmpp/xmppclient.cc b/talk/xmpp/xmppclient.cc index e378a01a49..27aa5e493c 100644 --- a/talk/xmpp/xmppclient.cc +++ b/talk/xmpp/xmppclient.cc @@ -25,16 +25,17 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "xmppclient.h" -#include "xmpptask.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/stringutils.h" +#include "talk/xmpp/xmppclient.h" + #include "talk/xmpp/constants.h" -#include "talk/xmpp/saslplainmechanism.h" -#include "talk/xmpp/prexmppauth.h" #include "talk/xmpp/plainsaslhandler.h" +#include "talk/xmpp/prexmppauth.h" +#include "talk/xmpp/saslplainmechanism.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/stringutils.h" +#include "xmpptask.h" namespace buzz { diff --git a/talk/xmpp/xmppclient.h b/talk/xmpp/xmppclient.h index e5b202e3d0..53b2d24f46 100644 --- a/talk/xmpp/xmppclient.h +++ b/talk/xmpp/xmppclient.h @@ -29,13 +29,13 @@ #define TALK_XMPP_XMPPCLIENT_H_ #include -#include "webrtc/base/basicdefs.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/task.h" #include "talk/xmpp/asyncsocket.h" #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" +#include "webrtc/base/basicdefs.h" +#include "webrtc/base/sigslot.h" +#include "webrtc/base/task.h" namespace buzz { diff --git a/talk/xmpp/xmppclientsettings.h b/talk/xmpp/xmppclientsettings.h index 8b5a4e2a28..50028b7c7d 100644 --- a/talk/xmpp/xmppclientsettings.h +++ b/talk/xmpp/xmppclientsettings.h @@ -29,8 +29,8 @@ #define TALK_XMPP_XMPPCLIENTSETTINGS_H_ #include "talk/p2p/base/port.h" -#include "webrtc/base/cryptstring.h" #include "talk/xmpp/xmppengine.h" +#include "webrtc/base/cryptstring.h" namespace buzz { diff --git a/talk/xmpp/xmppengine.h b/talk/xmpp/xmppengine.h index e1b35a372c..68f10feac4 100644 --- a/talk/xmpp/xmppengine.h +++ b/talk/xmpp/xmppengine.h @@ -29,9 +29,9 @@ #define _xmppengine_h_ // also part of the API -#include "talk/xmpp/jid.h" #include "talk/xmllite/qname.h" #include "talk/xmllite/xmlelement.h" +#include "talk/xmpp/jid.h" namespace buzz { diff --git a/talk/xmpp/xmppengine_unittest.cc b/talk/xmpp/xmppengine_unittest.cc index 779a7d8a27..8d6c858287 100644 --- a/talk/xmpp/xmppengine_unittest.cc +++ b/talk/xmpp/xmppengine_unittest.cc @@ -1,17 +1,17 @@ // Copyright 2004 Google Inc. All Rights Reserved // Author: David Bau -#include -#include #include -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" +#include +#include #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" -#include "talk/xmpp/util_unittest.h" -#include "talk/xmpp/saslplainmechanism.h" #include "talk/xmpp/plainsaslhandler.h" +#include "talk/xmpp/saslplainmechanism.h" +#include "talk/xmpp/util_unittest.h" #include "talk/xmpp/xmppengine.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" using buzz::Jid; using buzz::QName; diff --git a/talk/xmpp/xmppengineimpl.cc b/talk/xmpp/xmppengineimpl.cc index fb288a0918..bba96a4bbd 100644 --- a/talk/xmpp/xmppengineimpl.cc +++ b/talk/xmpp/xmppengineimpl.cc @@ -31,12 +31,12 @@ #include #include -#include "webrtc/base/common.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmllite/xmlprinter.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslhandler.h" #include "talk/xmpp/xmpplogintask.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmpp/xmppengineimpl_iq.cc b/talk/xmpp/xmppengineimpl_iq.cc index 3f449d0583..208e16478c 100644 --- a/talk/xmpp/xmppengineimpl_iq.cc +++ b/talk/xmpp/xmppengineimpl_iq.cc @@ -25,11 +25,11 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include -#include "webrtc/base/common.h" -#include "talk/xmpp/xmppengineimpl.h" +#include #include "talk/xmpp/constants.h" +#include "talk/xmpp/xmppengineimpl.h" +#include "webrtc/base/common.h" namespace buzz { diff --git a/talk/xmpp/xmpplogintask.cc b/talk/xmpp/xmpplogintask.cc index 1ff6e223e3..2183c4045c 100644 --- a/talk/xmpp/xmpplogintask.cc +++ b/talk/xmpp/xmpplogintask.cc @@ -30,13 +30,13 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/common.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/saslmechanism.h" #include "talk/xmpp/xmppengineimpl.h" +#include "webrtc/base/base64.h" +#include "webrtc/base/common.h" using rtc::ConstantLabel; diff --git a/talk/xmpp/xmpplogintask.h b/talk/xmpp/xmpplogintask.h index 61be0d2bde..86856580de 100644 --- a/talk/xmpp/xmpplogintask.h +++ b/talk/xmpp/xmpplogintask.h @@ -31,10 +31,10 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmppengine.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/scoped_ptr.h" namespace buzz { diff --git a/talk/xmpp/xmpplogintask_unittest.cc b/talk/xmpp/xmpplogintask_unittest.cc index 1a3b2d663a..1cc16cc8fe 100644 --- a/talk/xmpp/xmpplogintask_unittest.cc +++ b/talk/xmpp/xmpplogintask_unittest.cc @@ -1,18 +1,18 @@ // Copyright 2004 Google Inc. All Rights Reserved -#include -#include #include +#include +#include +#include "talk/xmllite/xmlelement.h" +#include "talk/xmpp/constants.h" +#include "talk/xmpp/plainsaslhandler.h" +#include "talk/xmpp/saslplainmechanism.h" +#include "talk/xmpp/util_unittest.h" +#include "talk/xmpp/xmppengine.h" #include "webrtc/base/common.h" #include "webrtc/base/cryptstring.h" #include "webrtc/base/gunit.h" -#include "talk/xmllite/xmlelement.h" -#include "talk/xmpp/util_unittest.h" -#include "talk/xmpp/constants.h" -#include "talk/xmpp/saslplainmechanism.h" -#include "talk/xmpp/plainsaslhandler.h" -#include "talk/xmpp/xmppengine.h" using buzz::Jid; using buzz::QName; diff --git a/talk/xmpp/xmpppump.h b/talk/xmpp/xmpppump.h index 4dc4ba836f..ff72f54bed 100644 --- a/talk/xmpp/xmpppump.h +++ b/talk/xmpp/xmpppump.h @@ -28,13 +28,13 @@ #ifndef TALK_XMPP_XMPPPUMP_H_ #define TALK_XMPP_XMPPPUMP_H_ +#include "talk/xmpp/xmppclient.h" +#include "talk/xmpp/xmppengine.h" +#include "talk/xmpp/xmpptask.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/taskrunner.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "talk/xmpp/xmppclient.h" -#include "talk/xmpp/xmppengine.h" -#include "talk/xmpp/xmpptask.h" namespace buzz { diff --git a/talk/xmpp/xmppsocket.h b/talk/xmpp/xmppsocket.h index e32ce4c767..3d6df52298 100644 --- a/talk/xmpp/xmppsocket.h +++ b/talk/xmpp/xmppsocket.h @@ -28,11 +28,11 @@ #ifndef TALK_XMPP_XMPPSOCKET_H_ #define TALK_XMPP_XMPPSOCKET_H_ +#include "talk/xmpp/asyncsocket.h" +#include "talk/xmpp/xmppengine.h" #include "webrtc/base/asyncsocket.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/sigslot.h" -#include "talk/xmpp/asyncsocket.h" -#include "talk/xmpp/xmppengine.h" // The below define selects the SSLStreamAdapter implementation for // SSL, as opposed to the SSLAdapter socket adapter. diff --git a/talk/xmpp/xmppstanzaparser.cc b/talk/xmpp/xmppstanzaparser.cc index 1b75f285ec..3e6ad47119 100644 --- a/talk/xmpp/xmppstanzaparser.cc +++ b/talk/xmpp/xmppstanzaparser.cc @@ -28,8 +28,8 @@ #include "talk/xmpp/xmppstanzaparser.h" #include "talk/xmllite/xmlelement.h" -#include "webrtc/base/common.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/common.h" #ifdef EXPAT_RELATIVE_PATH #include "expat.h" #else diff --git a/talk/xmpp/xmppstanzaparser.h b/talk/xmpp/xmppstanzaparser.h index c6f8b08adb..d9a8933c3f 100644 --- a/talk/xmpp/xmppstanzaparser.h +++ b/talk/xmpp/xmppstanzaparser.h @@ -28,8 +28,8 @@ #ifndef _xmppstanzaparser_h_ #define _xmppstanzaparser_h_ -#include "talk/xmllite/xmlparser.h" #include "talk/xmllite/xmlbuilder.h" +#include "talk/xmllite/xmlparser.h" namespace buzz { diff --git a/talk/xmpp/xmppstanzaparser_unittest.cc b/talk/xmpp/xmppstanzaparser_unittest.cc index 3930a9d4df..4e60d81348 100644 --- a/talk/xmpp/xmppstanzaparser_unittest.cc +++ b/talk/xmpp/xmppstanzaparser_unittest.cc @@ -1,13 +1,13 @@ // Copyright 2004 Google Inc. All Rights Reserved -#include -#include #include -#include "webrtc/base/common.h" -#include "webrtc/base/gunit.h" +#include +#include #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/xmppstanzaparser.h" +#include "webrtc/base/common.h" +#include "webrtc/base/gunit.h" using buzz::QName; using buzz::XmlElement; diff --git a/talk/xmpp/xmpptask.cc b/talk/xmpp/xmpptask.cc index 046f7a1040..c5e86fad92 100644 --- a/talk/xmpp/xmpptask.cc +++ b/talk/xmpp/xmpptask.cc @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/xmpptask.h" +#include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmppengine.h" -#include "talk/xmpp/constants.h" +#include "talk/xmpp/xmpptask.h" namespace buzz { diff --git a/talk/xmpp/xmpptask.h b/talk/xmpp/xmpptask.h index ab132898f0..f6dd156e12 100644 --- a/talk/xmpp/xmpptask.h +++ b/talk/xmpp/xmpptask.h @@ -28,12 +28,12 @@ #ifndef TALK_XMPP_XMPPTASK_H_ #define TALK_XMPP_XMPPTASK_H_ -#include #include +#include +#include "talk/xmpp/xmppengine.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/task.h" #include "webrtc/base/taskparent.h" -#include "talk/xmpp/xmppengine.h" namespace buzz { diff --git a/talk/xmpp/xmppthread.h b/talk/xmpp/xmppthread.h index a42fa4d31a..bfb74d6efc 100644 --- a/talk/xmpp/xmppthread.h +++ b/talk/xmpp/xmppthread.h @@ -28,11 +28,11 @@ #ifndef TALK_XMPP_XMPPTHREAD_H_ #define TALK_XMPP_XMPPTHREAD_H_ -#include "webrtc/base/thread.h" #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpppump.h" #include "talk/xmpp/xmppsocket.h" +#include "webrtc/base/thread.h" namespace buzz {