OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "mojo/message_pump/message_pump_mojo.h" | 12 #include "mojo/message_pump/message_pump_mojo.h" |
13 #include "mojo/public/cpp/bindings/interface_request.h" | 13 #include "mojo/public/cpp/bindings/interface_request.h" |
14 #include "mojo/services/network/network_context.h" | 14 #include "mojo/services/network/network_context.h" |
15 #include "mojo/services/network/url_loader_impl.h" | 15 #include "mojo/services/network/url_loader_impl.h" |
16 #include "mojo/shell/public/cpp/application_test_base.h" | 16 #include "mojo/shell/public/cpp/application_test_base.h" |
| 17 #include "mojo/shell/public/cpp/message_loop_ref.h" |
17 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
18 #include "net/url_request/url_request_job.h" | 19 #include "net/url_request/url_request_job.h" |
19 #include "net/url_request/url_request_job_factory_impl.h" | 20 #include "net/url_request/url_request_job_factory_impl.h" |
20 #include "net/url_request/url_request_status.h" | 21 #include "net/url_request/url_request_status.h" |
21 #include "net/url_request/url_request_test_util.h" | 22 #include "net/url_request/url_request_test_util.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
23 | 24 |
24 namespace mojo { | 25 namespace mojo { |
25 | 26 |
26 class TestURLRequestJob; | 27 class TestURLRequestJob; |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 new net::TestURLRequestContext(true)); | 123 new net::TestURLRequestContext(true)); |
123 ASSERT_TRUE(url_request_job_factory_.SetProtocolHandler( | 124 ASSERT_TRUE(url_request_job_factory_.SetProtocolHandler( |
124 "http", make_scoped_ptr(new TestProtocolHandler( | 125 "http", make_scoped_ptr(new TestProtocolHandler( |
125 wait_for_request_.QuitClosure())))); | 126 wait_for_request_.QuitClosure())))); |
126 url_request_context->set_job_factory(&url_request_job_factory_); | 127 url_request_context->set_job_factory(&url_request_job_factory_); |
127 url_request_context->Init(); | 128 url_request_context->Init(); |
128 network_context_.reset(new NetworkContext(std::move(url_request_context))); | 129 network_context_.reset(new NetworkContext(std::move(url_request_context))); |
129 MessagePipe pipe; | 130 MessagePipe pipe; |
130 new URLLoaderImpl(network_context_.get(), | 131 new URLLoaderImpl(network_context_.get(), |
131 GetProxy(&url_loader_proxy_), | 132 GetProxy(&url_loader_proxy_), |
132 make_scoped_ptr<mojo::AppRefCount>(nullptr)); | 133 make_scoped_ptr<mojo::MessageLoopRef>(nullptr)); |
133 EXPECT_TRUE(IsUrlLoaderValid()); | 134 EXPECT_TRUE(IsUrlLoaderValid()); |
134 } | 135 } |
135 | 136 |
136 bool IsUrlLoaderValid() { | 137 bool IsUrlLoaderValid() { |
137 return network_context_->GetURLLoaderCountForTesting() > 0u; | 138 return network_context_->GetURLLoaderCountForTesting() > 0u; |
138 } | 139 } |
139 | 140 |
140 base::MessageLoop message_loop_; | 141 base::MessageLoop message_loop_; |
141 net::TestJobInterceptor* job_interceptor_; | 142 net::TestJobInterceptor* job_interceptor_; |
142 net::URLRequestJobFactoryImpl url_request_job_factory_; | 143 net::URLRequestJobFactoryImpl url_request_job_factory_; |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 | 281 |
281 EXPECT_TRUE(IsUrlLoaderValid()); | 282 EXPECT_TRUE(IsUrlLoaderValid()); |
282 | 283 |
283 g_current_job->NotifyReadComplete(-1); | 284 g_current_job->NotifyReadComplete(-1); |
284 | 285 |
285 while (IsUrlLoaderValid()) | 286 while (IsUrlLoaderValid()) |
286 base::RunLoop().RunUntilIdle(); | 287 base::RunLoop().RunUntilIdle(); |
287 } | 288 } |
288 | 289 |
289 } // namespace mojo | 290 } // namespace mojo |
OLD | NEW |