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

Side by Side Diff: net/url_request/url_request_context_builder_unittest.cc

Issue 2090613002: Remove calls to deprecated MessageLoop methods in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 (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/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h"
10 #include "build/build_config.h" 11 #include "build/build_config.h"
11 #include "net/base/request_priority.h" 12 #include "net/base/request_priority.h"
12 #include "net/http/http_auth_challenge_tokenizer.h" 13 #include "net/http/http_auth_challenge_tokenizer.h"
13 #include "net/http/http_auth_handler.h" 14 #include "net/http/http_auth_handler.h"
14 #include "net/http/http_auth_handler_factory.h" 15 #include "net/http/http_auth_handler_factory.h"
15 #include "net/ssl/ssl_info.h" 16 #include "net/ssl/ssl_info.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h" 17 #include "net/test/embedded_test_server/embedded_test_server.h"
17 #include "net/url_request/url_request.h" 18 #include "net/url_request/url_request.h"
18 #include "net/url_request/url_request_test_util.h" 19 #include "net/url_request/url_request_test_util.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 TEST_F(URLRequestContextBuilderTest, DefaultSettings) { 73 TEST_F(URLRequestContextBuilderTest, DefaultSettings) {
73 ASSERT_TRUE(test_server_.Start()); 74 ASSERT_TRUE(test_server_.Start());
74 75
75 std::unique_ptr<URLRequestContext> context(builder_.Build()); 76 std::unique_ptr<URLRequestContext> context(builder_.Build());
76 TestDelegate delegate; 77 TestDelegate delegate;
77 std::unique_ptr<URLRequest> request(context->CreateRequest( 78 std::unique_ptr<URLRequest> request(context->CreateRequest(
78 test_server_.GetURL("/echoheader?Foo"), DEFAULT_PRIORITY, &delegate)); 79 test_server_.GetURL("/echoheader?Foo"), DEFAULT_PRIORITY, &delegate));
79 request->set_method("GET"); 80 request->set_method("GET");
80 request->SetExtraRequestHeaderByName("Foo", "Bar", false); 81 request->SetExtraRequestHeaderByName("Foo", "Bar", false);
81 request->Start(); 82 request->Start();
82 base::MessageLoop::current()->Run(); 83 base::RunLoop().Run();
83 EXPECT_EQ("Bar", delegate.data_received()); 84 EXPECT_EQ("Bar", delegate.data_received());
84 } 85 }
85 86
86 TEST_F(URLRequestContextBuilderTest, UserAgent) { 87 TEST_F(URLRequestContextBuilderTest, UserAgent) {
87 ASSERT_TRUE(test_server_.Start()); 88 ASSERT_TRUE(test_server_.Start());
88 89
89 builder_.set_user_agent("Bar"); 90 builder_.set_user_agent("Bar");
90 std::unique_ptr<URLRequestContext> context(builder_.Build()); 91 std::unique_ptr<URLRequestContext> context(builder_.Build());
91 TestDelegate delegate; 92 TestDelegate delegate;
92 std::unique_ptr<URLRequest> request( 93 std::unique_ptr<URLRequest> request(
93 context->CreateRequest(test_server_.GetURL("/echoheader?User-Agent"), 94 context->CreateRequest(test_server_.GetURL("/echoheader?User-Agent"),
94 DEFAULT_PRIORITY, &delegate)); 95 DEFAULT_PRIORITY, &delegate));
95 request->set_method("GET"); 96 request->set_method("GET");
96 request->Start(); 97 request->Start();
97 base::MessageLoop::current()->Run(); 98 base::RunLoop().Run();
98 EXPECT_EQ("Bar", delegate.data_received()); 99 EXPECT_EQ("Bar", delegate.data_received());
99 } 100 }
100 101
101 TEST_F(URLRequestContextBuilderTest, DefaultHttpAuthHandlerFactory) { 102 TEST_F(URLRequestContextBuilderTest, DefaultHttpAuthHandlerFactory) {
102 GURL gurl("www.google.com"); 103 GURL gurl("www.google.com");
103 std::unique_ptr<HttpAuthHandler> handler; 104 std::unique_ptr<HttpAuthHandler> handler;
104 std::unique_ptr<URLRequestContext> context(builder_.Build()); 105 std::unique_ptr<URLRequestContext> context(builder_.Build());
105 SSLInfo null_ssl_info; 106 SSLInfo null_ssl_info;
106 107
107 // Verify that the default basic handler is present 108 // Verify that the default basic handler is present
(...skipping 26 matching lines...) Expand all
134 // Verify that a handler isn't returned for a bogus scheme. 135 // Verify that a handler isn't returned for a bogus scheme.
135 EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME, 136 EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
136 context->http_auth_handler_factory()->CreateAuthHandlerFromString( 137 context->http_auth_handler_factory()->CreateAuthHandlerFromString(
137 "Bogus", HttpAuth::AUTH_SERVER, null_ssl_info, gurl, 138 "Bogus", HttpAuth::AUTH_SERVER, null_ssl_info, gurl,
138 BoundNetLog(), &handler)); 139 BoundNetLog(), &handler));
139 } 140 }
140 141
141 } // namespace 142 } // namespace
142 143
143 } // namespace net 144 } // namespace net
OLDNEW
« no previous file with comments | « net/tools/quic/synchronous_host_resolver.cc ('k') | net/url_request/url_request_job_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698