Skip to content

GitLab

T
tangled
Commit 82ab9ed6 authored by Han Leon's avatar Han Leon Committed by Commit Bot
Browse files
Options

[OnionSoup] Remove an unused function using WebServiceWorkerResponse 

Removing an unused function:
Response* Response::Create(
    ScriptState* script_state,
    const WebServiceWorkerResponse& web_response);

BUG=879019

Change-Id: I23878fd116cfee6acf6442f854f75b825d08cba4
Reviewed-on: https://chromium-review.googlesource.com/1195732Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Han Leon <leon.han@intel.com>
Cr-Commit-Position: refs/heads/master@{#587881}
parent 07fca6c6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 179 deletions
third_party/blink/renderer/core/fetch/response.cc
View file @ 82ab9ed6
......@@ -77,44 +77,6 @@ FetchResponseData* FilterResponseData(
return response;
}
FetchResponseData* CreateFetchResponseDataFromWebResponse(
ScriptState* script_state,
const WebServiceWorkerResponse& web_response) {
FetchResponseData* response = nullptr;
if (web_response.Status() > 0)
response = FetchResponseData::Create();
else
response = FetchResponseData::CreateNetworkErrorResponse();
const WebVector<WebURL>& web_url_list = web_response.UrlList();
Vector<KURL> url_list(web_url_list.size());
std::transform(web_url_list.begin(), web_url_list.end(), url_list.begin(),
[](const WebURL& url) { return url; });
response->SetURLList(url_list);
response->SetStatus(web_response.Status());
response->SetStatusMessage(web_response.StatusText());
response->SetResponseTime(web_response.ResponseTime());
response->SetCacheStorageCacheName(web_response.CacheStorageCacheName());
for (HTTPHeaderMap::const_iterator i = web_response.Headers().begin(),
end = web_response.Headers().end();
i != end; ++i) {
response->HeaderList()->Append(i->key, i->value);
}
response->ReplaceBodyStreamBuffer(new BodyStreamBuffer(
script_state,
new BlobBytesConsumer(ExecutionContext::From(script_state),
web_response.GetBlobDataHandle()),
nullptr /* AbortSignal */));
// Filter the response according to |webResponse|'s ResponseType.
response = FilterResponseData(web_response.ResponseType(), response,
web_response.CorsExposedHeaderNames());
return response;
}
FetchResponseData* CreateFetchResponseDataFromFetchAPIResponse(
ScriptState* script_state,
mojom::blink::FetchAPIResponse& fetch_api_response) {
......@@ -342,13 +304,6 @@ Response* Response::Create(ExecutionContext* context,
return new Response(context, response);
}
Response* Response::Create(ScriptState* script_state,
const WebServiceWorkerResponse& web_response) {
FetchResponseData* response_data =
CreateFetchResponseDataFromWebResponse(script_state, web_response);
return new Response(ExecutionContext::From(script_state), response_data);
}
Response* Response::Create(ScriptState* script_state,
mojom::blink::FetchAPIResponse& response) {
auto* fetch_response_data =
......
third_party/blink/renderer/core/fetch/response.h
View file @ 82ab9ed6
......@@ -45,7 +45,6 @@ class CORE_EXPORT Response final : public Body {
const ResponseInit&,
ExceptionState&);
static Response* Create(ExecutionContext*, FetchResponseData*);
static Response* Create(ScriptState*, const WebServiceWorkerResponse&);
static Response* Create(ScriptState*, mojom::blink::FetchAPIResponse&);
static Response* CreateClone(const Response&);
......
third_party/blink/renderer/core/fetch/response_test.cc
View file @ 82ab9ed6
......@@ -26,32 +26,6 @@
namespace blink {
namespace {
std::unique_ptr<WebServiceWorkerResponse> CreateTestWebServiceWorkerResponse() {
const KURL url("http://www.webresponse.com/");
const unsigned short kStatus = 200;
const String status_text = "the best status text";
struct {
const char* key;
const char* value;
} headers[] = {{"cache-control", "no-cache"},
{"set-cookie", "foop"},
{"foo", "bar"},
{nullptr, nullptr}};
Vector<WebURL> url_list;
url_list.push_back(url);
std::unique_ptr<WebServiceWorkerResponse> web_response =
std::make_unique<WebServiceWorkerResponse>();
web_response->SetURLList(url_list);
web_response->SetStatus(kStatus);
web_response->SetStatusText(status_text);
web_response->SetResponseType(network::mojom::FetchResponseType::kDefault);
for (int i = 0; headers[i].key; ++i) {
web_response->SetHeader(WebString::FromUTF8(headers[i].key),
WebString::FromUTF8(headers[i].value));
}
return web_response;
}
TEST(ServiceWorkerResponseTest, FromFetchResponseData) {
std::unique_ptr<DummyPageHolder> page =
DummyPageHolder::Create(IntSize(1, 1));
......@@ -67,106 +41,6 @@ TEST(ServiceWorkerResponseTest, FromFetchResponseData) {
EXPECT_EQ(url, response->url());
}
TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponse) {
V8TestingScope scope;
std::unique_ptr<WebServiceWorkerResponse> web_response =
CreateTestWebServiceWorkerResponse();
Response* response = Response::Create(scope.GetScriptState(), *web_response);
DCHECK(response);
ASSERT_EQ(1u, web_response->UrlList().size());
EXPECT_EQ(web_response->UrlList()[0], response->url());
EXPECT_EQ(web_response->Status(), response->status());
EXPECT_STREQ(web_response->StatusText().Utf8().c_str(),
response->statusText().Utf8().data());
Headers* response_headers = response->headers();
WebVector<WebString> keys = web_response->GetHeaderKeys();
EXPECT_EQ(keys.size(), response_headers->HeaderList()->size());
for (size_t i = 0, max = keys.size(); i < max; ++i) {
WebString key = keys[i];
DummyExceptionStateForTesting exception_state;
EXPECT_STREQ(web_response->GetHeader(key).Utf8().c_str(),
response_headers->get(key, exception_state).Utf8().data());
EXPECT_FALSE(exception_state.HadException());
}
}
TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponseDefault) {
V8TestingScope scope;
std::unique_ptr<WebServiceWorkerResponse> web_response =
CreateTestWebServiceWorkerResponse();
web_response->SetResponseType(network::mojom::FetchResponseType::kDefault);
Response* response = Response::Create(scope.GetScriptState(), *web_response);
Headers* response_headers = response->headers();
DummyExceptionStateForTesting exception_state;
EXPECT_STREQ(
"foop",
response_headers->get("set-cookie", exception_state).Utf8().data());
EXPECT_STREQ("bar",
response_headers->get("foo", exception_state).Utf8().data());
EXPECT_STREQ(
"no-cache",
response_headers->get("cache-control", exception_state).Utf8().data());
EXPECT_FALSE(exception_state.HadException());
}
TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponseBasic) {
V8TestingScope scope;
std::unique_ptr<WebServiceWorkerResponse> web_response =
CreateTestWebServiceWorkerResponse();
web_response->SetResponseType(network::mojom::FetchResponseType::kBasic);
Response* response = Response::Create(scope.GetScriptState(), *web_response);
Headers* response_headers = response->headers();
DummyExceptionStateForTesting exception_state;
EXPECT_STREQ(
"", response_headers->get("set-cookie", exception_state).Utf8().data());
EXPECT_STREQ("bar",
response_headers->get("foo", exception_state).Utf8().data());
EXPECT_STREQ(
"no-cache",
response_headers->get("cache-control", exception_state).Utf8().data());
EXPECT_FALSE(exception_state.HadException());
}
TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponseCORS) {
V8TestingScope scope;
std::unique_ptr<WebServiceWorkerResponse> web_response =
CreateTestWebServiceWorkerResponse();
web_response->SetResponseType(network::mojom::FetchResponseType::kCORS);
Response* response = Response::Create(scope.GetScriptState(), *web_response);
Headers* response_headers = response->headers();
DummyExceptionStateForTesting exception_state;
EXPECT_STREQ(
"", response_headers->get("set-cookie", exception_state).Utf8().data());
EXPECT_STREQ("", response_headers->get("foo", exception_state).Utf8().data());
EXPECT_STREQ(
"no-cache",
response_headers->get("cache-control", exception_state).Utf8().data());
EXPECT_FALSE(exception_state.HadException());
}
TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque) {
V8TestingScope scope;
std::unique_ptr<WebServiceWorkerResponse> web_response =
CreateTestWebServiceWorkerResponse();
web_response->SetResponseType(network::mojom::FetchResponseType::kOpaque);
Response* response = Response::Create(scope.GetScriptState(), *web_response);
Headers* response_headers = response->headers();
DummyExceptionStateForTesting exception_state;
EXPECT_STREQ(
"", response_headers->get("set-cookie", exception_state).Utf8().data());
EXPECT_STREQ("", response_headers->get("foo", exception_state).Utf8().data());
EXPECT_STREQ(
"",
response_headers->get("cache-control", exception_state).Utf8().data());
EXPECT_FALSE(exception_state.HadException());
}
void CheckResponseStream(ScriptState* script_state,
Response* response,
bool check_response_body_stream_buffer) {
......
third_party/blink/renderer/modules/cache_storage/cache_test.cc
View file @ 82ab9ed6
......@@ -14,7 +14,6 @@
#include "services/network/public/mojom/fetch_api.mojom-blink.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom-blink.h"
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_response.h"
#include "third_party/blink/public/platform/web_url_response.h"
#include "third_party/blink/renderer/bindings/core/v8/idl_types.h"
#include "third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h"
......@@ -516,12 +515,11 @@ TEST_F(CacheStorageTest, BatchOperationArguments) {
Request* request = NewRequestFromUrl(url);
DCHECK(request);
WebServiceWorkerResponse web_response;
std::vector<KURL> url_list;
url_list.push_back(KURL(url));
web_response.SetURLList(url_list);
web_response.SetStatusText("OK");
Response* response = Response::Create(GetScriptState(), web_response);
auto fetch_response = mojom::blink::FetchAPIResponse::New();
fetch_response->url_list.push_back(KURL(url));
fetch_response->response_type = network::mojom::FetchResponseType::kDefault;
fetch_response->status_text = String("OK");
Response* response = Response::Create(GetScriptState(), *fetch_response);
Vector<mojom::blink::BatchOperationPtr> expected_delete_operations;
{
......
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