| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "web/tests/sim/SimNetwork.h" | 5 #include "web/tests/sim/SimNetwork.h" |
| 6 | 6 |
| 7 #include "public/platform/Platform.h" | 7 #include "public/platform/Platform.h" |
| 8 #include "public/platform/WebURLError.h" | 8 #include "public/platform/WebURLError.h" |
| 9 #include "public/platform/WebURLLoader.h" | 9 #include "public/platform/WebURLLoader.h" |
| 10 #include "public/platform/WebURLLoaderClient.h" | 10 #include "public/platform/WebURLLoaderClient.h" |
| 11 #include "public/platform/WebURLLoaderMockFactory.h" |
| 11 #include "public/platform/WebURLResponse.h" | 12 #include "public/platform/WebURLResponse.h" |
| 12 #include "public/platform/WebUnitTestSupport.h" | |
| 13 #include "web/tests/sim/SimRequest.h" | 13 #include "web/tests/sim/SimRequest.h" |
| 14 | 14 |
| 15 namespace blink { | 15 namespace blink { |
| 16 | 16 |
| 17 static SimNetwork* s_network = nullptr; | 17 static SimNetwork* s_network = nullptr; |
| 18 | 18 |
| 19 SimNetwork::SimNetwork() | 19 SimNetwork::SimNetwork() |
| 20 : m_currentRequest(nullptr) | 20 : m_currentRequest(nullptr) |
| 21 { | 21 { |
| 22 Platform::current()->unitTestSupport()->setLoaderDelegate(this); | 22 Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(this); |
| 23 DCHECK(!s_network); | 23 ASSERT(!s_network); |
| 24 s_network = this; | 24 s_network = this; |
| 25 } | 25 } |
| 26 | 26 |
| 27 SimNetwork::~SimNetwork() | 27 SimNetwork::~SimNetwork() |
| 28 { | 28 { |
| 29 Platform::current()->unitTestSupport()->setLoaderDelegate(nullptr); | 29 Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(nullptr); |
| 30 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 30 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); |
| 31 s_network = nullptr; | 31 s_network = nullptr; |
| 32 } | 32 } |
| 33 | 33 |
| 34 SimNetwork& SimNetwork::current() | 34 SimNetwork& SimNetwork::current() |
| 35 { | 35 { |
| 36 DCHECK(s_network); | 36 DCHECK(s_network); |
| 37 return *s_network; | 37 return *s_network; |
| 38 } | 38 } |
| 39 | 39 |
| 40 void SimNetwork::servePendingRequests() | 40 void SimNetwork::servePendingRequests() |
| 41 { | 41 { |
| 42 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); | 42 Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void SimNetwork::didReceiveResponse(WebURLLoaderClient* client, WebURLLoader* lo
ader, const WebURLResponse& response) | 45 void SimNetwork::didReceiveResponse(WebURLLoaderClient* client, WebURLLoader* lo
ader, const WebURLResponse& response) |
| 46 { | 46 { |
| 47 auto it = m_requests.find(response.url().string()); | 47 auto it = m_requests.find(response.url().string()); |
| 48 if (it == m_requests.end()) { | 48 if (it == m_requests.end()) { |
| 49 client->didReceiveResponse(loader, response); | 49 client->didReceiveResponse(loader, response); |
| 50 return; | 50 return; |
| 51 } | 51 } |
| 52 DCHECK(it->value); | 52 DCHECK(it->value); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 82 { | 82 { |
| 83 m_requests.add(request.url(), &request); | 83 m_requests.add(request.url(), &request); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void SimNetwork::removeRequest(SimRequest& request) | 86 void SimNetwork::removeRequest(SimRequest& request) |
| 87 { | 87 { |
| 88 m_requests.remove(request.url()); | 88 m_requests.remove(request.url()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace blink | 91 } // namespace blink |
| OLD | NEW |