Commit c4f55f71 authored by Sergio Villar Senin's avatar Sergio Villar Senin Committed by Commit Bot

Migrate chrome/browser/net/proxy_browsertest.cc to SimpleURLLoader

This CL moves proxy_browsertest.cc away from URLFetcher, replacing it by
SimpleURLLoader.

Bug: 844915
Change-Id: Id0fd3ec4168f8b1c272906e6620c11b5418d2f54
Reviewed-on: https://chromium-review.googlesource.com/1141948
Commit-Queue: Sergio Villar <svillar@igalia.com>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576413}
parent 84450b05
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h" #include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_source.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
...@@ -34,8 +35,7 @@ ...@@ -34,8 +35,7 @@
#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/test/spawned_test_server/spawned_test_server.h"
#include "net/test/test_data_directory.h" #include "net/test/test_data_directory.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_fetcher.h" #include "services/network/public/cpp/simple_url_loader.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace { namespace {
...@@ -242,20 +242,6 @@ class HangingPacRequestProxyScriptBrowserTest : public InProcessBrowserTest { ...@@ -242,20 +242,6 @@ class HangingPacRequestProxyScriptBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(HangingPacRequestProxyScriptBrowserTest); DISALLOW_COPY_AND_ASSIGN(HangingPacRequestProxyScriptBrowserTest);
}; };
// URLFetcherDelegate that expects a request to hang.
class HangingURLFetcherDelegate : public net::URLFetcherDelegate {
public:
HangingURLFetcherDelegate() {}
~HangingURLFetcherDelegate() override {}
void OnURLFetchComplete(const net::URLFetcher* source) override {
ADD_FAILURE() << "This request should never complete.";
}
private:
DISALLOW_COPY_AND_ASSIGN(HangingURLFetcherDelegate);
};
// Check that the URLRequest for a PAC that is still alive during shutdown is // Check that the URLRequest for a PAC that is still alive during shutdown is
// safely cleaned up. This test relies on AssertNoURLRequests being called on // safely cleaned up. This test relies on AssertNoURLRequests being called on
// the main URLRequestContext. // the main URLRequestContext.
...@@ -263,12 +249,20 @@ IN_PROC_BROWSER_TEST_F(HangingPacRequestProxyScriptBrowserTest, Shutdown) { ...@@ -263,12 +249,20 @@ IN_PROC_BROWSER_TEST_F(HangingPacRequestProxyScriptBrowserTest, Shutdown) {
// Request that should hang while trying to request the PAC script. // Request that should hang while trying to request the PAC script.
// Enough requests are created on startup that this probably isn't needed, but // Enough requests are created on startup that this probably isn't needed, but
// best to be safe. // best to be safe.
HangingURLFetcherDelegate hanging_request_delegate; auto resource_request = std::make_unique<network::ResourceRequest>();
std::unique_ptr<net::URLFetcher> hanging_fetcher = net::URLFetcher::Create( resource_request->url = GURL("http://blah/");
GURL("http://blah/"), net::URLFetcher::GET, &hanging_request_delegate, auto simple_loader = network::SimpleURLLoader::Create(
TRAFFIC_ANNOTATION_FOR_TESTS); std::move(resource_request), TRAFFIC_ANNOTATION_FOR_TESTS);
hanging_fetcher->SetRequestContext(browser()->profile()->GetRequestContext());
hanging_fetcher->Start(); auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(browser()->profile());
auto url_loader_factory =
storage_partition->GetURLLoaderFactoryForBrowserProcess();
simple_loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory.get(),
base::BindOnce([](std::unique_ptr<std::string> body) {
ADD_FAILURE() << "This request should never complete.";
}));
connection_listener_->WaitForConnections(); connection_listener_->WaitForConnections();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment