0

Migrate to optional-based GetHeader overload

HttpRequestHeaders::GetHeader has a new overload
which returns an optional instead of using an out-
parameter. I'm migrating callers and will eventually
delete the old version of the method.

This CL was uploaded by git cl split.

R=agawronska@chromium.org

Bug: 355451174
Change-Id: I499a7ddfe4eec2edc22230c687fffff1065f32a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5749741
Auto-Submit: Chris Fredrickson <cfredric@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1334936}
This commit is contained in:
Chris Fredrickson
2024-07-30 17:12:52 +00:00
committed by Chromium LUCI CQ
parent 7a9688599b
commit 6d134fdec2

@ -6,6 +6,7 @@
#include "net/http/http_request_headers.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@ -139,9 +140,8 @@ TEST(SafeSearchUtilTest, SetYoutubeHeader) {
safe_search_api::ForceYouTubeRestrict(
GURL("http://www.youtube.com"), &headers,
safe_search_api::YOUTUBE_RESTRICT_MODERATE);
std::string value;
EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value));
EXPECT_EQ("Moderate", value);
EXPECT_THAT(headers.GetHeader("Youtube-Restrict"),
testing::Optional(std::string("Moderate")));
}
TEST(SafeSearchUtilTest, OverrideYoutubeHeader) {
@ -150,9 +150,8 @@ TEST(SafeSearchUtilTest, OverrideYoutubeHeader) {
safe_search_api::ForceYouTubeRestrict(
GURL("http://www.youtube.com"), &headers,
safe_search_api::YOUTUBE_RESTRICT_MODERATE);
std::string value;
EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value));
EXPECT_EQ("Moderate", value);
EXPECT_THAT(headers.GetHeader("Youtube-Restrict"),
testing::Optional(std::string("Moderate")));
}
TEST(SafeSearchUtilTest, DoesntTouchNonYoutubeURL) {
@ -161,9 +160,8 @@ TEST(SafeSearchUtilTest, DoesntTouchNonYoutubeURL) {
safe_search_api::ForceYouTubeRestrict(
GURL("http://www.notyoutube.com"), &headers,
safe_search_api::YOUTUBE_RESTRICT_MODERATE);
std::string value;
EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value));
EXPECT_EQ("Off", value);
EXPECT_THAT(headers.GetHeader("Youtube-Restrict"),
testing::Optional(std::string("Off")));
}
} // namespace