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

Side by Side Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_pipelined_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/json/json_writer.h" 16 #include "base/json/json_writer.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/metrics/histogram.h"
19 #include "base/string_util.h" 18 #include "base/string_util.h"
20 #include "base/test/test_file_util.h" 19 #include "base/test/test_file_util.h"
21 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
22 #include "net/base/auth.h" 21 #include "net/base/auth.h"
23 #include "net/base/capturing_net_log.h" 22 #include "net/base/capturing_net_log.h"
24 #include "net/base/cert_test_util.h" 23 #include "net/base/cert_test_util.h"
25 #include "net/base/completion_callback.h" 24 #include "net/base/completion_callback.h"
26 #include "net/base/host_cache.h" 25 #include "net/base/host_cache.h"
27 #include "net/base/load_timing_info.h" 26 #include "net/base/load_timing_info.h"
28 #include "net/base/load_timing_info_test_util.h" 27 #include "net/base/load_timing_info_test_util.h"
(...skipping 11187 matching lines...) Expand 10 before | Expand all | Expand 10 after
11216 trans2.Start(&request2, callback2.callback(), BoundNetLog())); 11215 trans2.Start(&request2, callback2.callback(), BoundNetLog()));
11217 MessageLoop::current()->RunUntilIdle(); 11216 MessageLoop::current()->RunUntilIdle();
11218 data2->RunFor(3); 11217 data2->RunFor(3);
11219 11218
11220 ASSERT_TRUE(callback2.have_result()); 11219 ASSERT_TRUE(callback2.have_result());
11221 EXPECT_EQ(OK, callback2.WaitForResult()); 11220 EXPECT_EQ(OK, callback2.WaitForResult());
11222 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); 11221 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
11223 } 11222 }
11224 11223
11225 } // namespace net 11224 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_pipelined_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698