Commit 4c5789da authored by Eric Roman's avatar Eric Roman Committed by Commit Bot

Remove some unused methods on LoFiDecider.

Bug: 721403
Change-Id: I56ab262ba7349e6261816e99fe01fe1d39e0e79a
Reviewed-on: https://chromium-review.googlesource.com/1237252Reviewed-by: default avatarTarun Bansal <tbansal@chromium.org>
Commit-Queue: Eric Roman <eroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593014}
parent 0deeaa65
...@@ -122,43 +122,6 @@ void ContentLoFiDecider::MaybeSetAcceptTransformHeader( ...@@ -122,43 +122,6 @@ void ContentLoFiDecider::MaybeSetAcceptTransformHeader(
accept_transform_value); accept_transform_value);
} }
bool ContentLoFiDecider::IsSlowPagePreviewRequested(
const net::HttpRequestHeaders& headers) const {
std::string accept_transform_header_value;
if (!headers.GetHeader(chrome_proxy_accept_transform_header(),
&accept_transform_header_value)) {
return false;
}
std::vector<std::string> tokens =
base::SplitString(base::ToLowerASCII(accept_transform_header_value), ";",
base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
// A slow page preview is a request for any unqualified transform type.
if (tokens.size() != 1)
return false;
std::string transform_type;
base::TrimWhitespaceASCII(tokens[0], base::TRIM_ALL, &transform_type);
return (transform_type == lite_page_directive() ||
transform_type == empty_image_directive());
}
bool ContentLoFiDecider::IsLitePagePreviewRequested(
const net::HttpRequestHeaders& headers) const {
std::string accept_transform_header_value;
if (!headers.GetHeader(chrome_proxy_accept_transform_header(),
&accept_transform_header_value)) {
return false;
}
std::vector<std::string> tokens =
base::SplitString(base::ToLowerASCII(accept_transform_header_value), ";",
base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
if (tokens.empty())
return false;
std::string transform_type;
base::TrimWhitespaceASCII(tokens[0], base::TRIM_ALL, &transform_type);
return transform_type == lite_page_directive();
}
void ContentLoFiDecider::RemoveAcceptTransformHeader( void ContentLoFiDecider::RemoveAcceptTransformHeader(
net::HttpRequestHeaders* headers) const { net::HttpRequestHeaders* headers) const {
headers->RemoveHeader(chrome_proxy_accept_transform_header()); headers->RemoveHeader(chrome_proxy_accept_transform_header());
......
...@@ -41,10 +41,6 @@ class ContentLoFiDecider : public LoFiDecider { ...@@ -41,10 +41,6 @@ class ContentLoFiDecider : public LoFiDecider {
void MaybeSetAcceptTransformHeader( void MaybeSetAcceptTransformHeader(
const net::URLRequest& request, const net::URLRequest& request,
net::HttpRequestHeaders* headers) const override; net::HttpRequestHeaders* headers) const override;
bool IsSlowPagePreviewRequested(
const net::HttpRequestHeaders& headers) const override;
bool IsLitePagePreviewRequested(
const net::HttpRequestHeaders& headers) const override;
void RemoveAcceptTransformHeader( void RemoveAcceptTransformHeader(
net::HttpRequestHeaders* headers) const override; net::HttpRequestHeaders* headers) const override;
bool ShouldRecordLoFiUMA(const net::URLRequest& request) const override; bool ShouldRecordLoFiUMA(const net::URLRequest& request) const override;
......
...@@ -415,43 +415,6 @@ TEST_F(ContentLoFiDeciderTest, VideoDirectiveDoesNotOverride) { ...@@ -415,43 +415,6 @@ TEST_F(ContentLoFiDeciderTest, VideoDirectiveDoesNotOverride) {
EXPECT_EQ("empty-image", header_value); EXPECT_EQ("empty-image", header_value);
} }
TEST_F(ContentLoFiDeciderTest, IsSlowPagePreviewRequested) {
std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
new data_reduction_proxy::ContentLoFiDecider());
net::HttpRequestHeaders headers;
EXPECT_FALSE(lofi_decider->IsSlowPagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "lite-page");
EXPECT_TRUE(lofi_decider->IsSlowPagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "lite-page;foo");
EXPECT_FALSE(lofi_decider->IsSlowPagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "empty-image");
EXPECT_TRUE(lofi_decider->IsSlowPagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "empty-image;foo");
EXPECT_FALSE(lofi_decider->IsSlowPagePreviewRequested(headers));
headers.SetHeader("Another-Header", "empty-image");
lofi_decider->RemoveAcceptTransformHeader(&headers);
EXPECT_FALSE(lofi_decider->IsSlowPagePreviewRequested(headers));
}
TEST_F(ContentLoFiDeciderTest, IsLitePagePreviewRequested) {
std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
new data_reduction_proxy::ContentLoFiDecider());
net::HttpRequestHeaders headers;
EXPECT_FALSE(lofi_decider->IsLitePagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "empty-image");
EXPECT_FALSE(lofi_decider->IsLitePagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(),
"empty-image;lite-page");
EXPECT_FALSE(lofi_decider->IsLitePagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "lite-page");
EXPECT_TRUE(lofi_decider->IsLitePagePreviewRequested(headers));
headers.SetHeader(chrome_proxy_accept_transform_header(), "lite-page;foo");
EXPECT_TRUE(lofi_decider->IsLitePagePreviewRequested(headers));
headers.SetHeader("Another-Header", "lite-page");
lofi_decider->RemoveAcceptTransformHeader(&headers);
EXPECT_FALSE(lofi_decider->IsLitePagePreviewRequested(headers));
}
TEST_F(ContentLoFiDeciderTest, RemoveAcceptTransformHeader) { TEST_F(ContentLoFiDeciderTest, RemoveAcceptTransformHeader) {
std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider( std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
new data_reduction_proxy::ContentLoFiDecider()); new data_reduction_proxy::ContentLoFiDecider());
......
...@@ -220,27 +220,6 @@ class TestLoFiDecider : public LoFiDecider { ...@@ -220,27 +220,6 @@ class TestLoFiDecider : public LoFiDecider {
} }
} }
bool IsSlowPagePreviewRequested(
const net::HttpRequestHeaders& headers) const override {
std::string header_value;
if (headers.GetHeader(chrome_proxy_accept_transform_header(),
&header_value)) {
return header_value == empty_image_directive() ||
header_value == lite_page_directive();
}
return false;
}
bool IsLitePagePreviewRequested(
const net::HttpRequestHeaders& headers) const override {
std::string header_value;
if (headers.GetHeader(chrome_proxy_accept_transform_header(),
&header_value)) {
return header_value == lite_page_directive();
}
return false;
}
void RemoveAcceptTransformHeader( void RemoveAcceptTransformHeader(
net::HttpRequestHeaders* headers) const override { net::HttpRequestHeaders* headers) const override {
if (ignore_is_using_data_reduction_proxy_check_) if (ignore_is_using_data_reduction_proxy_check_)
......
...@@ -26,17 +26,6 @@ class LoFiDecider { ...@@ -26,17 +26,6 @@ class LoFiDecider {
const net::URLRequest& request, const net::URLRequest& request,
net::HttpRequestHeaders* headers) const = 0; net::HttpRequestHeaders* headers) const = 0;
// Returns true if |headers| contains the Chrome-Proxy-Accept-Transform
// header and a slow page previews directive ("lite-page" or "empty-image")
// is present and not conditioned on "if-heavy".
virtual bool IsSlowPagePreviewRequested(
const net::HttpRequestHeaders& headers) const = 0;
// Returns true if |headers| contains the Chrome-Proxy-Accept-Transform
// header with the "lite-page" directive.
virtual bool IsLitePagePreviewRequested(
const net::HttpRequestHeaders& headers) const = 0;
// Unconditionally removes the Chrome-Proxy-Accept-Transform header from // Unconditionally removes the Chrome-Proxy-Accept-Transform header from
// |headers.| // |headers.|
virtual void RemoveAcceptTransformHeader( virtual void RemoveAcceptTransformHeader(
......
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