summaryrefslogtreecommitdiff
path: root/chromium/net/server
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 17:21:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 16:25:15 +0000
commitc551f43206405019121bd2b2c93714319a0a3300 (patch)
tree1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/net/server
parent7961cea6d1041e3e454dae6a1da660b453efd238 (diff)
downloadqtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/server')
-rw-r--r--chromium/net/server/http_server_unittest.cc49
1 files changed, 13 insertions, 36 deletions
diff --git a/chromium/net/server/http_server_unittest.cc b/chromium/net/server/http_server_unittest.cc
index 7fefb5f94b9..7f404ad0010 100644
--- a/chromium/net/server/http_server_unittest.cc
+++ b/chromium/net/server/http_server_unittest.cc
@@ -44,11 +44,6 @@
#include "net/test/gtest_util.h"
#include "net/test/test_with_task_environment.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
-#include "net/url_request/url_fetcher.h"
-#include "net/url_request/url_fetcher_delegate.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "net/url_request/url_request_test_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -451,37 +446,19 @@ TEST_F(WebSocketTest, RequestWebSocketTrailingJunk) {
}
TEST_F(HttpServerTest, RequestWithTooLargeBody) {
- class TestURLFetcherDelegate : public URLFetcherDelegate {
- public:
- TestURLFetcherDelegate(const base::Closure& quit_loop_func)
- : quit_loop_func_(quit_loop_func) {}
- ~TestURLFetcherDelegate() override = default;
-
- void OnURLFetchComplete(const URLFetcher* source) override {
- EXPECT_EQ(HTTP_INTERNAL_SERVER_ERROR, source->GetResponseCode());
- quit_loop_func_.Run();
- }
-
- private:
- base::Closure quit_loop_func_;
- };
-
- base::RunLoop run_loop;
- TestURLFetcherDelegate delegate(run_loop.QuitClosure());
-
- scoped_refptr<URLRequestContextGetter> request_context_getter(
- new TestURLRequestContextGetter(base::ThreadTaskRunnerHandle::Get()));
- std::unique_ptr<URLFetcher> fetcher = URLFetcher::Create(
- GURL(base::StringPrintf("http://127.0.0.1:%d/test",
- server_address_.port())),
- URLFetcher::GET, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS);
- fetcher->SetRequestContext(request_context_getter.get());
- fetcher->AddExtraRequestHeader(
- base::StringPrintf("content-length:%d", 1 << 30));
- fetcher->Start();
-
- run_loop.Run();
- ASSERT_EQ(0u, requests_.size());
+ TestHttpClient client;
+ ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
+ client.Send(
+ "GET /test HTTP/1.1\r\n"
+ "Content-Length: 1073741824\r\n\r\n");
+ std::string response;
+ ASSERT_TRUE(client.ReadResponse(&response));
+ EXPECT_EQ(
+ "HTTP/1.1 500 Internal Server Error\r\n"
+ "Content-Length:42\r\n"
+ "Content-Type:text/html\r\n\r\n"
+ "request content-length too big or unknown.",
+ response);
}
TEST_F(HttpServerTest, Send200) {