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

Unified Diff: net/socket/socks_client_socket_pool_unittest.cc

Issue 11428150: LoadTiming implementation in net, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Try upload again Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/socks_client_socket_pool_unittest.cc
===================================================================
--- net/socket/socks_client_socket_pool_unittest.cc (revision 172981)
+++ net/socket/socks_client_socket_pool_unittest.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/time.h"
+#include "net/base/load_timing_info.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
@@ -23,6 +24,32 @@
const int kMaxSockets = 32;
const int kMaxSocketsPerGroup = 6;
+// Make sure |handle|'s load times are set correctly. Only connect times should
+// be set.
+void TestLoadTimingInfo(const ClientSocketHandle& handle) {
+ LoadTimingInfo load_timing_info;
+ EXPECT_TRUE(handle.GetLoadTimingInfo(false, &load_timing_info));
+
+ // None of these tests use a NetLog.
+ EXPECT_EQ(NetLog::Source::kInvalidId, load_timing_info.socket_log_id);
+
+ EXPECT_FALSE(load_timing_info.socket_reused);
+
+ EXPECT_FALSE(load_timing_info.connect_start.is_null());
+ EXPECT_LE(load_timing_info.connect_start, load_timing_info.connect_end);
+
+ // None of these should be set by the socket handle.
+ EXPECT_TRUE(load_timing_info.proxy_start.is_null());
+ EXPECT_TRUE(load_timing_info.proxy_end.is_null());
+ EXPECT_TRUE(load_timing_info.dns_start.is_null());
+ EXPECT_TRUE(load_timing_info.dns_end.is_null());
+ EXPECT_TRUE(load_timing_info.ssl_start.is_null());
+ EXPECT_TRUE(load_timing_info.ssl_end.is_null());
+ EXPECT_TRUE(load_timing_info.send_start.is_null());
+ EXPECT_TRUE(load_timing_info.send_end.is_null());
+ EXPECT_TRUE(load_timing_info.receive_headers_end.is_null());
+}
+
class SOCKSClientSocketPoolTest : public testing::Test {
protected:
class SOCKS5MockData {
@@ -107,6 +134,7 @@
EXPECT_EQ(OK, rv);
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
+ TestLoadTimingInfo(handle);
}
TEST_F(SOCKSClientSocketPoolTest, Async) {
@@ -124,6 +152,7 @@
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
+ TestLoadTimingInfo(handle);
}
TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) {

Powered by Google App Engine
This is Rietveld 408576698