Landing Recent QUIC changes until 9/2/2015 17:00 UTC.

net/tools/quic/quic_client_test.cc

Index: net/tools/quic/quic_client_test.cc
diff --git a/net/tools/quic/quic_client_test.cc b/net/tools/quic/quic_client_test.cc
index 09ae26a0eef5ace7d3b7bf12bc87f3366ef1c87d..e3a7270536f63e9a3972371110ce14c1a27b0ad7 100644
--- a/net/tools/quic/quic_client_test.cc
+++ b/net/tools/quic/quic_client_test.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "net/tools/quic/quic_client.h"
+
 #include <dirent.h>
 #include <stdio.h>
 
@@ -9,7 +11,6 @@
 #include "base/strings/string_util.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/epoll_server/epoll_server.h"
-#include "net/tools/quic/quic_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::EpollServer;