Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: chrome/browser/net/safe_search_util_unittest.cc

Issue 2401733002: Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy" (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/safe_search_util.h" 5 #include "chrome/browser/net/safe_search_util.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "net/http/http_request_headers.h" 10 #include "net/http/http_request_headers.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 // Test with percent-encoded data (%26 is &) 137 // Test with percent-encoded data (%26 is &)
138 CheckAddedParameters("http://google.com/?q=%26%26%26&" + kSsuiParameter + 138 CheckAddedParameters("http://google.com/?q=%26%26%26&" + kSsuiParameter +
139 "&" + kSafeParameter + "&param=%26%26%26", 139 "&" + kSafeParameter + "&param=%26%26%26",
140 "q=%26%26%26&param=%26%26%26&" + kBothParameters); 140 "q=%26%26%26&param=%26%26%26&" + kBothParameters);
141 } 141 }
142 142
143 TEST_F(SafeSearchUtilTest, SetYoutubeHeader) { 143 TEST_F(SafeSearchUtilTest, SetYoutubeHeader) {
144 std::unique_ptr<net::URLRequest> request = CreateYoutubeRequest(); 144 std::unique_ptr<net::URLRequest> request = CreateYoutubeRequest();
145 net::HttpRequestHeaders headers; 145 net::HttpRequestHeaders headers;
146 safe_search_util::ForceYouTubeRestrict( 146 safe_search_util::ForceYouTubeSafetyMode(request.get(), &headers);
147 request.get(), &headers, safe_search_util::YOUTUBE_RESTRICT_MODERATE);
148 std::string value; 147 std::string value;
149 EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value)); 148 EXPECT_TRUE(headers.GetHeader("Youtube-Safety-Mode", &value));
150 EXPECT_EQ("Moderate", value); 149 EXPECT_EQ("Active", value);
151 } 150 }
152 151
153 TEST_F(SafeSearchUtilTest, OverrideYoutubeHeader) { 152 TEST_F(SafeSearchUtilTest, OverrideYoutubeHeader) {
154 std::unique_ptr<net::URLRequest> request = CreateYoutubeRequest(); 153 std::unique_ptr<net::URLRequest> request = CreateYoutubeRequest();
155 net::HttpRequestHeaders headers; 154 net::HttpRequestHeaders headers;
156 headers.SetHeader("Youtube-Restrict", "Off"); 155 headers.SetHeader("Youtube-Safety-Mode", "Off");
157 safe_search_util::ForceYouTubeRestrict( 156 safe_search_util::ForceYouTubeSafetyMode(request.get(), &headers);
158 request.get(), &headers, safe_search_util::YOUTUBE_RESTRICT_MODERATE);
159 std::string value; 157 std::string value;
160 EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value)); 158 EXPECT_TRUE(headers.GetHeader("Youtube-Safety-Mode", &value));
161 EXPECT_EQ("Moderate", value); 159 EXPECT_EQ("Active", value);
162 } 160 }
163 161
164 TEST_F(SafeSearchUtilTest, DoesntTouchNonYoutubeURL) { 162 TEST_F(SafeSearchUtilTest, DoesntTouchNonYoutubeURL) {
165 std::unique_ptr<net::URLRequest> request = CreateNonYoutubeRequest(); 163 std::unique_ptr<net::URLRequest> request = CreateNonYoutubeRequest();
166 net::HttpRequestHeaders headers; 164 net::HttpRequestHeaders headers;
167 headers.SetHeader("Youtube-Restrict", "Off"); 165 headers.SetHeader("Youtube-Safety-Mode", "Off");
168 safe_search_util::ForceYouTubeRestrict( 166 safe_search_util::ForceYouTubeSafetyMode(request.get(), &headers);
169 request.get(), &headers, safe_search_util::YOUTUBE_RESTRICT_MODERATE);
170 std::string value; 167 std::string value;
171 EXPECT_TRUE(headers.GetHeader("Youtube-Restrict", &value)); 168 EXPECT_TRUE(headers.GetHeader("Youtube-Safety-Mode", &value));
172 EXPECT_EQ("Off", value); 169 EXPECT_EQ("Off", value);
173 } 170 }
OLDNEW
« no previous file with comments | « chrome/browser/net/safe_search_util.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698