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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_basic_state.h" 5 #include "net/http/http_basic_state.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "net/base/completion_callback.h" 8 #include "net/base/completion_callback.h"
9 #include "net/base/request_priority.h" 9 #include "net/base/request_priority.h"
10 #include "net/http/http_request_info.h" 10 #include "net/http/http_request_info.h"
(...skipping 27 matching lines...) Expand all
38 HttpBasicState state(base::WrapUnique(handle), false, false); 38 HttpBasicState state(base::WrapUnique(handle), false, false);
39 const std::unique_ptr<ClientSocketHandle> released_connection( 39 const std::unique_ptr<ClientSocketHandle> released_connection(
40 state.ReleaseConnection()); 40 state.ReleaseConnection());
41 EXPECT_EQ(NULL, state.connection()); 41 EXPECT_EQ(NULL, state.connection());
42 EXPECT_EQ(handle, released_connection.get()); 42 EXPECT_EQ(handle, released_connection.get());
43 } 43 }
44 44
45 TEST(HttpBasicStateTest, InitializeWorks) { 45 TEST(HttpBasicStateTest, InitializeWorks) {
46 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), false, false); 46 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), false, false);
47 const HttpRequestInfo request_info; 47 const HttpRequestInfo request_info;
48 EXPECT_EQ(OK, 48 EXPECT_EQ(OK, state.Initialize(&request_info, LOW, NetLogWithSource(),
49 state.Initialize( 49 CompletionCallback()));
50 &request_info, LOW, BoundNetLog(), CompletionCallback()));
51 EXPECT_TRUE(state.parser()); 50 EXPECT_TRUE(state.parser());
52 } 51 }
53 52
54 TEST(HttpBasicStateTest, DeleteParser) { 53 TEST(HttpBasicStateTest, DeleteParser) {
55 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), false, false); 54 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), false, false);
56 const HttpRequestInfo request_info; 55 const HttpRequestInfo request_info;
57 state.Initialize(&request_info, LOW, BoundNetLog(), CompletionCallback()); 56 state.Initialize(&request_info, LOW, NetLogWithSource(),
57 CompletionCallback());
58 EXPECT_TRUE(state.parser()); 58 EXPECT_TRUE(state.parser());
59 state.DeleteParser(); 59 state.DeleteParser();
60 EXPECT_EQ(NULL, state.parser()); 60 EXPECT_EQ(NULL, state.parser());
61 } 61 }
62 62
63 TEST(HttpBasicStateTest, GenerateRequestLineNoProxy) { 63 TEST(HttpBasicStateTest, GenerateRequestLineNoProxy) {
64 const bool use_proxy = false; 64 const bool use_proxy = false;
65 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), use_proxy, 65 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), use_proxy,
66 false); 66 false);
67 HttpRequestInfo request_info; 67 HttpRequestInfo request_info;
68 request_info.url = GURL("http://www.example.com/path?foo=bar#hoge"); 68 request_info.url = GURL("http://www.example.com/path?foo=bar#hoge");
69 request_info.method = "PUT"; 69 request_info.method = "PUT";
70 state.Initialize(&request_info, LOW, BoundNetLog(), CompletionCallback()); 70 state.Initialize(&request_info, LOW, NetLogWithSource(),
71 CompletionCallback());
71 EXPECT_EQ("PUT /path?foo=bar HTTP/1.1\r\n", state.GenerateRequestLine()); 72 EXPECT_EQ("PUT /path?foo=bar HTTP/1.1\r\n", state.GenerateRequestLine());
72 } 73 }
73 74
74 TEST(HttpBasicStateTest, GenerateRequestLineWithProxy) { 75 TEST(HttpBasicStateTest, GenerateRequestLineWithProxy) {
75 const bool use_proxy = true; 76 const bool use_proxy = true;
76 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), use_proxy, 77 HttpBasicState state(base::MakeUnique<ClientSocketHandle>(), use_proxy,
77 false); 78 false);
78 HttpRequestInfo request_info; 79 HttpRequestInfo request_info;
79 request_info.url = GURL("http://www.example.com/path?foo=bar#hoge"); 80 request_info.url = GURL("http://www.example.com/path?foo=bar#hoge");
80 request_info.method = "PUT"; 81 request_info.method = "PUT";
81 state.Initialize(&request_info, LOW, BoundNetLog(), CompletionCallback()); 82 state.Initialize(&request_info, LOW, NetLogWithSource(),
83 CompletionCallback());
82 EXPECT_EQ("PUT http://www.example.com/path?foo=bar HTTP/1.1\r\n", 84 EXPECT_EQ("PUT http://www.example.com/path?foo=bar HTTP/1.1\r\n",
83 state.GenerateRequestLine()); 85 state.GenerateRequestLine());
84 } 86 }
85 87
86 } // namespace 88 } // namespace
87 } // namespace net 89 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698