(Auto)update libjingle 73222930-> 73226398

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d

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 {
 

talk/app/webrtc/datachannel.h

@@ -28,16 +28,16 @@
 #ifndef TALK_APP_WEBRTC_DATACHANNEL_H_
 #define TALK_APP_WEBRTC_DATACHANNEL_H_
 
-#include <string>
 #include <deque>
+#include <string>
 
 #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 {
 

talk/app/webrtc/java/jni/peerconnection_jni.cc

@@ -57,19 +57,15 @@
 #define JNIEXPORT __attribute__((visibility("default")))
 
 #include <asm/unistd.h>
-#include <limits>
-#include <map>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
+#include <limits>
+#include <map>
 
 #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"

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;

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;

talk/app/webrtc/jsepicecandidate.h

@@ -33,8 +33,8 @@
 #include <string>
 
 #include "talk/app/webrtc/jsep.h"
-#include "webrtc/base/constructormagic.h"
 #include "talk/p2p/base/candidate.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

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;

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;

talk/app/webrtc/localaudiosource.cc

@@ -29,8 +29,8 @@
 
 #include <vector>
 
-#include "talk/media/base/mediaengine.h"
 #include "talk/app/webrtc/mediaconstraintsinterface.h"
+#include "talk/media/base/mediaengine.h"
 
 using webrtc::MediaConstraintsInterface;
 using webrtc::MediaSourceInterface;

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.

talk/app/webrtc/localaudiosource_unittest.cc

@@ -31,10 +31,10 @@
 #include <vector>
 
 #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;

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";

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 {
 

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;

talk/app/webrtc/mediastreamsignaling.cc

@@ -30,17 +30,17 @@
 #include <vector>
 
 #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";

talk/app/webrtc/mediastreamsignaling.h

@@ -28,17 +28,17 @@
 #ifndef TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_
 #define TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #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;

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"};

talk/app/webrtc/notifier.h

@@ -30,8 +30,8 @@
 
 #include <list>
 
-#include "webrtc/base/common.h"
 #include "talk/app/webrtc/mediastreaminterface.h"
+#include "webrtc/base/common.h"
 
 namespace webrtc {
 

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<cricket::VideoFrame> _videoFrame;

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 {
 

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"
 

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 {
 

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

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 {
 

talk/app/webrtc/peerconnection.h

@@ -31,8 +31,8 @@
 #include <string>
 
 #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"

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())) {                               \

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"

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 {
 

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;

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";

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 {
 

talk/app/webrtc/proxy_unittest.cc

@@ -29,11 +29,11 @@
 
 #include <string>
 
+#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;

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 {
 

talk/app/webrtc/remotevideocapturer_unittest.cc

@@ -28,8 +28,8 @@
 #include <string>
 
 #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;

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:

talk/app/webrtc/statscollector.cc

@@ -30,10 +30,10 @@
 #include <utility>
 #include <vector>
 
+#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 {
 

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::_;

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 {
 

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

talk/app/webrtc/videosource_unittest.cc

@@ -28,15 +28,15 @@
 #include <string>
 #include <vector>
 
-#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;

talk/app/webrtc/videotrack_unittest.cc

@@ -27,16 +27,16 @@
 
 #include <string>
 
-#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;

talk/app/webrtc/videotrackrenderers.h

@@ -31,8 +31,8 @@
 #include <vector>
 
 #include "talk/app/webrtc/mediastreaminterface.h"
-#include "webrtc/base/criticalsection.h"
 #include "talk/media/base/videorenderer.h"
+#include "webrtc/base/criticalsection.h"
 
 namespace webrtc {
 

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;

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;

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;

talk/app/webrtc/webrtcsession.h

@@ -30,16 +30,16 @@
 
 #include <string>
 
-#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 {
 

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())) {                               \

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;

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:

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);

talk/examples/call/callclient.cc

@@ -29,14 +29,6 @@
 
 #include <string>
 
-#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 {
 

talk/examples/call/callclient.h

@@ -32,8 +32,6 @@
 #include <string>
 #include <vector>
 
-#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;

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;

talk/examples/call/console.cc

@@ -35,11 +35,11 @@
 #include <unistd.h>
 #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) {}

talk/examples/call/console.h

@@ -30,9 +30,9 @@
 
 #include <stdio.h>
 
-#include "webrtc/base/thread.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/thread.h"
 
 class CallClient;
 

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 {
 

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<cricket::AudioCodec> RequiredAudioCodecs() {
   std::vector<cricket::AudioCodec> audio_codecs;

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 {
 

talk/examples/call/mucinviterecvtask.h

@@ -30,9 +30,9 @@
 
 #include <vector>
 
-#include "webrtc/base/sigslot.h"
 #include "talk/xmpp/xmppengine.h"
 #include "talk/xmpp/xmpptask.h"
+#include "webrtc/base/sigslot.h"
 
 namespace buzz {
 

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 {
 

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"
 
 
 

talk/examples/call/presencepushtask.h

@@ -30,11 +30,11 @@
 
 #include <vector>
 
+#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 {
 

talk/examples/login/login_main.cc

@@ -29,11 +29,11 @@
 
 #include <iostream>
 
-#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: ";

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 <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>

talk/examples/peerconnection/client/conductor.cc

@@ -30,11 +30,11 @@
 #include <utility>
 
 #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";

talk/examples/peerconnection/client/conductor.h

@@ -34,10 +34,10 @@
 #include <set>
 #include <string>
 
-#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 {

talk/examples/peerconnection/client/main_wnd.cc

@@ -29,9 +29,9 @@
 
 #include <math.h>
 
+#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";

talk/examples/peerconnection/client/main_wnd.h

@@ -33,12 +33,12 @@
 #include <string>
 
 #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:

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

talk/examples/peerconnection/client/peer_connection_client.h

@@ -33,10 +33,10 @@
 #include <string>
 
 #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<int, std::string> Peers;
 

talk/examples/peerconnection/server/main.cc

@@ -31,10 +31,10 @@
 
 #include <vector>
 
-#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.");

talk/examples/relayserver/relayserver_main.cc

@@ -27,9 +27,9 @@
 
 #include <iostream>  // 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) {

talk/examples/stunserver/stunserver_main.cc

@@ -31,8 +31,8 @@
 
 #include <iostream>
 
-#include "webrtc/base/thread.h"
 #include "talk/p2p/base/stunserver.h"
+#include "webrtc/base/thread.h"
 
 using namespace cricket;
 

talk/examples/turnserver/turnserver_main.cc

@@ -27,12 +27,12 @@
 
 #include <iostream>  // 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";
 

talk/media/base/capturemanager.cc

@@ -29,10 +29,10 @@
 
 #include <algorithm>
 
-#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 {
 

talk/media/base/capturemanager.h

@@ -46,9 +46,9 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/sigslotrepeater.h"
 #include "talk/media/base/capturerenderadapter.h"
 #include "talk/media/base/videocommon.h"
+#include "webrtc/base/sigslotrepeater.h"
 
 namespace cricket {
 

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;
 

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 {
 

talk/media/base/capturerenderadapter.h

@@ -36,9 +36,9 @@
 
 #include <vector>
 
+#include "talk/media/base/videocapturer.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/sigslot.h"
-#include "talk/media/base/videocapturer.h"
 
 namespace cricket {
 

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;

talk/media/base/fakemediaengine.h

@@ -34,13 +34,13 @@
 #include <string>
 #include <vector>
 
-#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 {
 

talk/media/base/fakenetworkinterface.h

@@ -28,9 +28,11 @@
 #ifndef TALK_MEDIA_BASE_FAKENETWORKINTERFACE_H_
 #define TALK_MEDIA_BASE_FAKENETWORKINTERFACE_H_
 
-#include <vector>
 #include <map>
+#include <vector>
 
+#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 {
 

talk/media/base/fakevideocapturer.h

@@ -32,10 +32,10 @@
 
 #include <vector>
 
-#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

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 {
 

talk/media/base/filemediaengine.cc

@@ -27,14 +27,14 @@
 
 #include <limits.h>
 
+#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 {
 

talk/media/base/filemediaengine.h

@@ -29,11 +29,11 @@
 #include <string>
 #include <vector>
 
-#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;

talk/media/base/filemediaengine_unittest.cc

@@ -27,15 +27,15 @@
 
 #include <set>
 
+#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 {
 

talk/media/base/hybriddataengine.h

@@ -31,10 +31,10 @@
 #include <string>
 #include <vector>
 
-#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 {
 

talk/media/base/hybridvideoengine.h

@@ -31,12 +31,12 @@
 #include <string>
 #include <vector>
 
-#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 {
 

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);

talk/media/base/mediachannel.h

@@ -31,6 +31,9 @@
 #include <string>
 #include <vector>
 
+#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"
 

talk/media/base/mediaengine.h

@@ -37,8 +37,6 @@
 #include <string>
 #include <vector>
 
-#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

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 {
 

talk/media/base/rtpdataengine.h

@@ -31,10 +31,10 @@
 #include <string>
 #include <vector>
 
-#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 {
 

talk/media/base/rtpdataengine_unittest.cc

@@ -27,16 +27,16 @@
 
 #include <string>
 
+#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:

talk/media/base/rtpdump.cc

@@ -31,10 +31,10 @@
 
 #include <string>
 
+#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;

talk/media/base/rtpdump_unittest.cc

@@ -27,12 +27,12 @@
 
 #include <string>
 
-#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 {
 

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 {
 

talk/media/base/streamparams.h

@@ -44,8 +44,8 @@
 #define TALK_MEDIA_BASE_STREAMPARAMS_H_
 
 #include <algorithm>
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "webrtc/base/basictypes.h"

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};