Reland "Add a test helper method in services/network to get the body from a ResourceRequest."
This is a reland of 30184c71c6875b2457958cb8dac401d3d761147c
Original change's description:
> Add a test helper method in services/network to get the body from a ResourceRequest.
>
> Also remove the custom URLLoaderFactory in content_hash_fetcher_unittest. This isn't needed anymore as TestURLLoaderFactory now supports Clone.
>
> Cq-Include-Trybots: luci.chromium.try:linux_mojo
> Change-Id: Id70ec605886a6b0f2cb9bf7392fac4eff85fc1b3
> Reviewed-on: https://chromium-review.googlesource.com/1115346
> Reviewed-by: Doug Turner <[email protected]>
> Commit-Queue: John Abd-El-Malek <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#570813}
Change-Id: If27653a4cc7e94d7f44b02f9eb790e2a46949cc4
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Reviewed-on: https://chromium-review.googlesource.com/1118438
Reviewed-by: John Abd-El-Malek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#571117}diff --git a/components/sync/driver/sync_stopped_reporter_unittest.cc b/components/sync/driver/sync_stopped_reporter_unittest.cc
index b1f5a29..8ae6be90 100644
--- a/components/sync/driver/sync_stopped_reporter_unittest.cc
+++ b/components/sync/driver/sync_stopped_reporter_unittest.cc
@@ -15,6 +15,7 @@
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/test/test_url_loader_factory.h"
+#include "services/network/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer {
@@ -64,17 +65,6 @@
return request_result_;
}
- std::string GetBodyFromRequest(const network::ResourceRequest& request) {
- auto body = request.request_body;
- if (!body)
- return std::string();
-
- CHECK_EQ(1u, body->elements()->size());
- auto& element = body->elements()->at(0);
- CHECK_EQ(network::DataElement::TYPE_BYTES, element.type());
- return std::string(element.bytes(), element.length());
- }
-
network::TestURLLoaderFactory* url_loader_factory() {
return &test_url_loader_factory_;
}
@@ -132,7 +122,7 @@
base::BindLambdaForTesting([&](const network::ResourceRequest& request) {
intercepted_url = request.url;
intercepted_headers = request.headers;
- intercepted_body = GetBodyFromRequest(request);
+ intercepted_body = network::GetUploadData(request);
}));
SyncStoppedReporter ssr(test_url(), user_agent(), shared_url_loader_factory(),
callback());
