OOR-CORS: Rename *CORS* to *Cors* so to conform styleguide
This is mechanical, but a large change set.
As we discussed at a code review in the past, let's rename
all CORS related names.
Bug: 875759
Change-Id: I1d626f229ac3ddc7a1d83e921449db0d1472af1c
Tbr: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Reviewed-on: https://chromium-review.googlesource.com/c/1333018
Commit-Queue: Takashi Toyoshima <[email protected]>
Reviewed-by: Yutaka Hirano <[email protected]>
Cr-Commit-Position: refs/heads/master@{#608647}diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java
index f32584d..024ed80 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java
@@ -296,7 +296,7 @@
* @throws MalformedURLException
*/
@Test
- public void testMediaUrlResolver_validMpeg4CompatibleCORS() throws MalformedURLException {
+ public void testMediaUrlResolver_validMpeg4CompatibleCors() throws MalformedURLException {
// If a compatible CORS header returned, a valid mpeg4 URI is playable and unchanged.
Uri uri = Uri.parse("http://example.com/test.mp4");
HashMap<String, List<String>> corsHeaders = new HashMap<String, List<String>>();
@@ -314,7 +314,7 @@
* @throws MalformedURLException
*/
@Test
- public void testMediaUrlResolver_validMpeg4InompatilbeCORS() throws MalformedURLException {
+ public void testMediaUrlResolver_validMpeg4InompatilbeCors() throws MalformedURLException {
// If an incompatible CORS header returned, a valid mpeg4 URI is not playable but unchanged.
Uri uri = Uri.parse("http://example.com/test.mp4");
HashMap<String, List<String>> corsHeaders = new HashMap<String, List<String>>();
@@ -333,7 +333,7 @@
* @throws MalformedURLException
*/
@Test
- public void testMediaUrlResolver_validHLSNoCORS() throws MalformedURLException {
+ public void testMediaUrlResolver_validHLSNoCors() throws MalformedURLException {
// A valid mpeg4 URI is playable and unchanged.
Uri uri = Uri.parse("http://example.com/test.m3u8");
TestDelegate delegate = resolveUri(uri, null, 200, null, null, false);
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index e1c9a4b..365fb66 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3467,9 +3467,9 @@
flag_descriptions::kEnableNetworkServiceInProcessDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kNetworkServiceInProcess)},
- {"out-of-blink-cors", flag_descriptions::kEnableOutOfBlinkCORSName,
- flag_descriptions::kEnableOutOfBlinkCORSDescription, kOsAll,
- FEATURE_VALUE_TYPE(network::features::kOutOfBlinkCORS)},
+ {"out-of-blink-cors", flag_descriptions::kEnableOutOfBlinkCorsName,
+ flag_descriptions::kEnableOutOfBlinkCorsDescription, kOsAll,
+ FEATURE_VALUE_TYPE(network::features::kOutOfBlinkCors)},
#if defined(OS_ANDROID)
{"use-ddljson-api", flag_descriptions::kUseDdljsonApiName,
diff --git a/chrome/browser/android/headers_classifier.cc b/chrome/browser/android/headers_classifier.cc
index 46f5fdd..1d74b8d1 100644
--- a/chrome/browser/android/headers_classifier.cc
+++ b/chrome/browser/android/headers_classifier.cc
@@ -19,7 +19,7 @@
std::string header_name(ConvertJavaStringToUTF8(env, j_header_name));
std::string header_value(ConvertJavaStringToUTF8(env, j_header_value));
- return network::cors::IsCORSSafelistedHeader(header_name, header_value);
+ return network::cors::IsCorsSafelistedHeader(header_name, header_value);
}
} // namespace android
diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc
index 391f5cc..9d7e6c4 100644
--- a/chrome/browser/client_hints/client_hints_browsertest.cc
+++ b/chrome/browser/client_hints/client_hints_browsertest.cc
@@ -647,13 +647,13 @@
std::string(blink::kClientHintsHeaderMapping[i]) == "ect") {
continue;
}
- EXPECT_TRUE(network::cors::IsCORSSafelistedHeader(
+ EXPECT_TRUE(network::cors::IsCorsSafelistedHeader(
blink::kClientHintsHeaderMapping[i], "42" /* value */));
}
- EXPECT_FALSE(network::cors::IsCORSSafelistedHeader("not-a-client-hint-header",
+ EXPECT_FALSE(network::cors::IsCorsSafelistedHeader("not-a-client-hint-header",
"" /* value */));
EXPECT_TRUE(
- network::cors::IsCORSSafelistedHeader("save-data", "on" /* value */));
+ network::cors::IsCorsSafelistedHeader("save-data", "on" /* value */));
}
// Loads a webpage that requests persisting of client hints. Verifies that
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index c3f9475..d3af761d 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -696,8 +696,8 @@
"into decisions for what optimizations to perform on some pages on slow "
"networks.";
-const char kEnableOutOfBlinkCORSName[] = "Out of blink CORS";
-const char kEnableOutOfBlinkCORSDescription[] =
+const char kEnableOutOfBlinkCorsName[] = "Out of blink CORS";
+const char kEnableOutOfBlinkCorsDescription[] =
"CORS handling logic is moved out of blink.";
const char kExperimentalAccessibilityFeaturesName[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index e78e13f2..96a1eb2 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -445,8 +445,8 @@
extern const char kEnableOptimizationHintsName[];
extern const char kEnableOptimizationHintsDescription[];
-extern const char kEnableOutOfBlinkCORSName[];
-extern const char kEnableOutOfBlinkCORSDescription[];
+extern const char kEnableOutOfBlinkCorsName[];
+extern const char kEnableOutOfBlinkCorsDescription[];
extern const char kVizDisplayCompositorName[];
extern const char kVizDisplayCompositorDescription[];
diff --git a/chrome/browser/predictors/loading_predictor_browsertest.cc b/chrome/browser/predictors/loading_predictor_browsertest.cc
index ba1fa32..3ff8f2f0 100644
--- a/chrome/browser/predictors/loading_predictor_browsertest.cc
+++ b/chrome/browser/predictors/loading_predictor_browsertest.cc
@@ -657,7 +657,7 @@
// Tests that preconnect warms up a socket connection to a test server.
// Note: This test uses a data URI to serve the preconnect hint, to make sure
// that the network stack doesn't just re-use its connection to the test server.
-IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectNonCORS) {
+IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectNonCors) {
GURL preconnect_url = embedded_test_server()->base_url();
std::string preconnect_content =
"<link rel=\"preconnect\" href=\"" + preconnect_url.spec() + "\">";
@@ -672,7 +672,7 @@
// and that that socket is later used when fetching a resource.
// Note: This test uses a data URI to serve the preconnect hint, to make sure
// that the network stack doesn't just re-use its connection to the test server.
-IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectAndFetchNonCORS) {
+IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectAndFetchNonCors) {
GURL preconnect_url = embedded_test_server()->base_url();
// First navigation to content with a preconnect hint.
std::string preconnect_content =
@@ -696,7 +696,7 @@
// server, and that socket is later used when fetching a CORS resource.
// Note: This test uses a data URI to serve the preconnect hint, to make sure
// that the network stack doesn't just re-use its connection to the test server.
-IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectAndFetchCORS) {
+IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest, PreconnectAndFetchCors) {
GURL preconnect_url = embedded_test_server()->base_url();
// First navigation to content with a preconnect hint.
std::string preconnect_content = "<link rel=\"preconnect\" href=\"" +
@@ -722,7 +722,7 @@
// Note: This test uses a data URI to serve the preconnect hint, to make sure
// that the network stack doesn't just re-use its connection to the test server.
IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest,
- PreconnectNonCORSAndFetchCORS) {
+ PreconnectNonCorsAndFetchCors) {
GURL preconnect_url = embedded_test_server()->base_url();
// First navigation to content with a preconnect hint.
std::string preconnect_content =
@@ -748,7 +748,7 @@
// Note: This test uses a data URI to serve the preconnect hint, to make sure
// that the network stack doesn't just re-use its connection to the test server.
IN_PROC_BROWSER_TEST_F(LoadingPredictorBrowserTest,
- PreconnectCORSAndFetchNonCORS) {
+ PreconnectCorsAndFetchNonCors) {
GURL preconnect_url = embedded_test_server()->base_url();
// First navigation to content with a preconnect hint.
std::string preconnect_content = "<link rel=\"preconnect\" href=\"" +
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index 64420ef..15e98b7 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -286,7 +286,7 @@
origin_patterns->push_back(network::mojom::CorsOriginPattern::New(
content::kChromeUIScheme, chrome::kChromeUIThemeHost,
false /*allow_destination_subdomains*/,
- network::mojom::CORSOriginAccessMatchPriority::kMaxPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kMaxPriority));
}
// TODO(jstritar): We should try to remove this special case. Also, these
@@ -297,7 +297,7 @@
origin_patterns->push_back(network::mojom::CorsOriginPattern::New(
content::kChromeUIScheme, chrome::kChromeUIExtensionIconHost,
false /*allow_destination_subdomains*/,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
}
}
diff --git a/chrome/test/data/predictor/fetch_cross_site.js b/chrome/test/data/predictor/fetch_cross_site.js
index 976eacdd..42f5b05a 100644
--- a/chrome/test/data/predictor/fetch_cross_site.js
+++ b/chrome/test/data/predictor/fetch_cross_site.js
@@ -5,7 +5,7 @@
// This script file should be requested with the following query params:
// subresourceHost: The base url of the embedded test server to request
// subresources from.
-// numCORSResources: The number of resources to request (between 0 and 3).
+// numCorsResources: The number of resources to request (between 0 and 3).
var queryString = window.location.search.substring(1);
var vars = queryString.split("&");
var parsedParams = {};
@@ -14,14 +14,14 @@
parsedParams[key_value[0]] = key_value[1];
});
var subresourceHost = parsedParams['subresourceHost'];
-var numCORSResources = parseInt(parsedParams['numCORSResources'], 10);
+var numCorsResources = parseInt(parsedParams['numCorsResources'], 10);
var sendImmediately = parseInt(parsedParams['sendImmediately'], 10);
var subresourceList = [
'predictor/empty.js',
'predictor/empty1.js',
'predictor/empty2.js',
];
-var CORSSubresources = subresourceList.slice(0, numCORSResources);
+var CorsSubresources = subresourceList.slice(0, numCorsResources);
var numOK = 0;
function logResponse(r) {
@@ -29,7 +29,7 @@
// make cross origin requests with no-cors.
if (r.status == 200 || r.type == "opaque") {
numOK++;
- if (numOK == numCORSResources) {
+ if (numOK == numCorsResources) {
window.domAutomationController.send(true);
}
} else {
@@ -38,7 +38,7 @@
}
function startFetchesAndWaitForReply() {
- CORSSubresources.forEach(function(r) {
+ CorsSubresources.forEach(function(r) {
fetch(subresourceHost + r, {mode: 'cors', method: 'get'}).then(logResponse);
});
}
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index 6cb2290..f65bcaa 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -243,7 +243,7 @@
RunNaClIntegrationTest(path);
})
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CrossOriginCORS) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CrossOriginCors) {
RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors.html"));
}
@@ -255,7 +255,7 @@
RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html"));
}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CORSNoCookie) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CorsNoCookie) {
RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors_no_cookie.html"));
}
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 60d7752..5ba429e 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -337,7 +337,7 @@
request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kSameOrigin);
} else {
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
}
diff --git a/content/browser/background_fetch/background_fetch_delegate_proxy.cc b/content/browser/background_fetch/background_fetch_delegate_proxy.cc
index 3ac5447..a4cb7b0 100644
--- a/content/browser/background_fetch/background_fetch_delegate_proxy.cc
+++ b/content/browser/background_fetch/background_fetch_delegate_proxy.cc
@@ -149,9 +149,9 @@
// Append the Origin header for requests whose CORS flag is set, or whose
// request method is not GET or HEAD. See section 3.1 of the standard:
// https://fetch.spec.whatwg.org/#origin-header
- if (fetch_request.mode == network::mojom::FetchRequestMode::kCORS ||
+ if (fetch_request.mode == network::mojom::FetchRequestMode::kCors ||
fetch_request.mode ==
- network::mojom::FetchRequestMode::kCORSWithForcedPreflight ||
+ network::mojom::FetchRequestMode::kCorsWithForcedPreflight ||
(fetch_request.method != "GET" && fetch_request.method != "HEAD")) {
headers.SetHeader("Origin", origin.Serialize());
}
diff --git a/content/browser/background_fetch/background_fetch_job_controller.cc b/content/browser/background_fetch/background_fetch_job_controller.cc
index a5093a70..8987da8 100644
--- a/content/browser/background_fetch/background_fetch_job_controller.cc
+++ b/content/browser/background_fetch/background_fetch_job_controller.cc
@@ -33,7 +33,7 @@
// Requests that require CORS preflights are temporarily blocked, because the
// browser side of Background Fetch doesn't yet support performing CORS
// checks. TODO(crbug.com/711354): Remove this temporary block.
-bool RequiresCORSPreflight(const BackgroundFetchRequestInfo& request,
+bool RequiresCorsPreflight(const BackgroundFetchRequestInfo& request,
const url::Origin& origin) {
const blink::mojom::FetchAPIRequest& fetch_request = request.fetch_request();
@@ -47,7 +47,7 @@
// element require a CORS-preflight request.
// https://fetch.spec.whatwg.org/#main-fetch
if (!fetch_request.method.empty() &&
- !network::cors::IsCORSSafelistedMethod(fetch_request.method)) {
+ !network::cors::IsCorsSafelistedMethod(fetch_request.method)) {
return true;
}
@@ -55,7 +55,7 @@
for (const auto& header : fetch_request.headers)
headers.emplace_back(header.first, header.second);
- return !network::cors::CORSUnsafeRequestHeaderNames(headers).empty();
+ return !network::cors::CorsUnsafeRequestHeaderNames(headers).empty();
}
} // namespace
@@ -137,7 +137,7 @@
active_request_finished_callback_ = std::move(request_finished_callback);
if (IsMixedContent(*request.get()) ||
- RequiresCORSPreflight(*request.get(), registration_id_.origin())) {
+ RequiresCorsPreflight(*request.get(), registration_id_.origin())) {
request->SetEmptyResultWithFailureReason(
BackgroundFetchResult::FailureReason::FETCH_ERROR);
diff --git a/content/browser/cache_storage/cache_storage_cache.cc b/content/browser/cache_storage/cache_storage_cache.cc
index 971d293..78869a3f 100644
--- a/content/browser/cache_storage/cache_storage_cache.cc
+++ b/content/browser/cache_storage/cache_storage_cache.cc
@@ -95,7 +95,7 @@
case proto::CacheResponse::BASIC_TYPE:
return network::mojom::FetchResponseType::kBasic;
case proto::CacheResponse::CORS_TYPE:
- return network::mojom::FetchResponseType::kCORS;
+ return network::mojom::FetchResponseType::kCors;
case proto::CacheResponse::DEFAULT_TYPE:
return network::mojom::FetchResponseType::kDefault;
case proto::CacheResponse::ERROR_TYPE:
@@ -114,7 +114,7 @@
switch (response_type) {
case network::mojom::FetchResponseType::kBasic:
return proto::CacheResponse::BASIC_TYPE;
- case network::mojom::FetchResponseType::kCORS:
+ case network::mojom::FetchResponseType::kCors:
return proto::CacheResponse::CORS_TYPE;
case network::mojom::FetchResponseType::kDefault:
return proto::CacheResponse::DEFAULT_TYPE;
@@ -365,7 +365,7 @@
bool has_urls) {
switch (response_type) {
case network::mojom::FetchResponseType::kBasic:
- case network::mojom::FetchResponseType::kCORS:
+ case network::mojom::FetchResponseType::kCors:
case network::mojom::FetchResponseType::kDefault:
case network::mojom::FetchResponseType::kError:
return false;
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc
index 8b2a09c..75101af 100644
--- a/content/browser/cache_storage/cache_storage_cache_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -1573,7 +1573,7 @@
TEST_P(CacheStorageCacheTestP, PutResponseType) {
EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kBasic));
- EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kCORS));
+ EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kCors));
EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kDefault));
EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kError));
EXPECT_TRUE(TestResponseType(network::mojom::FetchResponseType::kOpaque));
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc
index 8930e46..4f53272 100644
--- a/content/browser/cache_storage/cache_storage_manager_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc
@@ -1195,7 +1195,7 @@
// Choose a response type that will not be padded so that the expected
// cache size can be calculated.
- const FetchResponseType response_type = FetchResponseType::kCORS;
+ const FetchResponseType response_type = FetchResponseType::kCors;
// Create a new cache.
int64_t cache_size;
diff --git a/content/browser/file_url_loader_factory.cc b/content/browser/file_url_loader_factory.cc
index 389fd19..1bd35c6 100644
--- a/content/browser/file_url_loader_factory.cc
+++ b/content/browser/file_url_loader_factory.cc
@@ -96,7 +96,7 @@
return url.ReplaceComponents(replacements);
}
-bool ShouldFailRequestDueToCORS(const network::ResourceRequest& request) {
+bool ShouldFailRequestDueToCors(const network::ResourceRequest& request) {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableWebSecurity)) {
return false;
@@ -104,7 +104,7 @@
const auto mode = request.fetch_request_mode;
if (mode == network::mojom::FetchRequestMode::kNavigate ||
- mode == network::mojom::FetchRequestMode::kNoCORS) {
+ mode == network::mojom::FetchRequestMode::kNoCors) {
return false;
}
@@ -733,12 +733,12 @@
return;
}
- // FileURLLoader doesn't support CORS and it's not covered by CORSURLLoader,
+ // FileURLLoader doesn't support CORS and it's not covered by CorsURLLoader,
// so we need to reject requests that need CORS manually.
- if (ShouldFailRequestDueToCORS(request)) {
+ if (ShouldFailRequestDueToCors(request)) {
client->OnComplete(
- network::URLLoaderCompletionStatus(network::CORSErrorStatus(
- network::mojom::CORSError::kCORSDisabledScheme)));
+ network::URLLoaderCompletionStatus(network::CorsErrorStatus(
+ network::mojom::CorsError::kCorsDisabledScheme)));
return;
}
diff --git a/content/browser/frame_host/mixed_content_navigation_throttle.cc b/content/browser/frame_host/mixed_content_navigation_throttle.cc
index 68f4365..ea6fff1 100644
--- a/content/browser/frame_host/mixed_content_navigation_throttle.cc
+++ b/content/browser/frame_host/mixed_content_navigation_throttle.cc
@@ -35,9 +35,9 @@
}
// Should return the same value as SecurityOrigin::isLocal and
-// SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled.
-bool ShouldTreatURLSchemeAsCORSEnabled(const GURL& url) {
- return base::ContainsValue(url::GetCORSEnabledSchemes(), url.scheme());
+// SchemeRegistry::shouldTreatURLSchemeAsCorsEnabled.
+bool ShouldTreatURLSchemeAsCorsEnabled(const GURL& url) {
+ return base::ContainsValue(url::GetCorsEnabledSchemes(), url.scheme());
}
// Should return the same value as the resource URL checks assigned to
@@ -168,7 +168,7 @@
blink::WebMixedContentContextType mixed_context_type =
handle_impl->mixed_content_context_type();
- if (!ShouldTreatURLSchemeAsCORSEnabled(handle_impl->GetURL()))
+ if (!ShouldTreatURLSchemeAsCorsEnabled(handle_impl->GetURL()))
mixed_context_type =
blink::WebMixedContentContextType::kOptionallyBlockable;
diff --git a/content/browser/loader/cors_file_origin_browsertest.cc b/content/browser/loader/cors_file_origin_browsertest.cc
index 9790099..0aea60a5 100644
--- a/content/browser/loader/cors_file_origin_browsertest.cc
+++ b/content/browser/loader/cors_file_origin_browsertest.cc
@@ -48,37 +48,37 @@
// Tests end to end Origin header and CORS check behaviors without
// --allow-file-access-from-files flag.
-class CORSFileOriginBrowserTest
+class CorsFileOriginBrowserTest
: public ContentBrowserTest,
public testing::WithParamInterface<CorsTestMode> {
public:
- CORSFileOriginBrowserTest()
+ CorsFileOriginBrowserTest()
: pass_string_(base::ASCIIToUTF16("PASS")),
fail_string_(base::ASCIIToUTF16("FAIL")) {
switch (GetParam()) {
case CorsTestMode::kInBlink:
scoped_feature_list_.InitWithFeatures(
{} /* enabled */,
- {network::features::kOutOfBlinkCORS,
+ {network::features::kOutOfBlinkCors,
blink::features::kServiceWorkerServicification,
network::features::kNetworkService} /* disabled */);
break;
case CorsTestMode::kInBrowserProcess:
scoped_feature_list_.InitWithFeatures(
- {network::features::kOutOfBlinkCORS,
+ {network::features::kOutOfBlinkCors,
blink::features::kServiceWorkerServicification} /* enabled */,
{network::features::kNetworkService} /* disabled */);
break;
case CorsTestMode::kInNetworkService:
scoped_feature_list_.InitWithFeatures(
- {network::features::kOutOfBlinkCORS,
+ {network::features::kOutOfBlinkCors,
blink::features::kServiceWorkerServicification,
network::features::kNetworkService} /* enabled */,
{} /*disabled */);
break;
}
}
- ~CORSFileOriginBrowserTest() override = default;
+ ~CorsFileOriginBrowserTest() override = default;
protected:
GURL CreateTestDataURL(const std::string& relative_path) {
@@ -146,7 +146,7 @@
test_data_loader_path_.Append(FILE_PATH_LITERAL("loader"));
embedded_test_server()->RegisterRequestHandler(base::BindRepeating(
- &CORSFileOriginBrowserTest::HandleWithAccessControlAllowOrigin,
+ &CorsFileOriginBrowserTest::HandleWithAccessControlAllowOrigin,
base::Unretained(this)));
ASSERT_TRUE(embedded_test_server()->Start());
@@ -202,27 +202,27 @@
base::test::ScopedFeatureList scoped_command_line_;
base::test::ScopedFeatureList scoped_feature_list_;
- DISALLOW_COPY_AND_ASSIGN(CORSFileOriginBrowserTest);
+ DISALLOW_COPY_AND_ASSIGN(CorsFileOriginBrowserTest);
};
// Tests end to end Origin header and CORS check behaviors with
// --allow-file-access-from-files flag.
-class CORSFileOriginBrowserTestWithAllowFileAccessFromFiles
- : public CORSFileOriginBrowserTest {
+class CorsFileOriginBrowserTestWithAllowFileAccessFromFiles
+ : public CorsFileOriginBrowserTest {
private:
bool AllowFileAccessFromFiles() const override { return true; }
};
// Tests end to end Origin header and CORS check behaviors with
// --disable-web-security flag.
-class CORSFileOriginBrowserTestWithDisableWebSecurity
- : public CORSFileOriginBrowserTest {
+class CorsFileOriginBrowserTestWithDisableWebSecurity
+ : public CorsFileOriginBrowserTest {
private:
bool AllowFileAccessFromFiles() const override { return false; }
bool IsWebSecurityEnabled() const override { return false; }
};
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTest,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTest,
AccessControlAllowOriginIsNull) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -235,7 +235,7 @@
EXPECT_TRUE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTest,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTest,
AccessControlAllowOriginIsFile) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -248,7 +248,7 @@
EXPECT_TRUE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTest, AccessToSelfFileUrl) {
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTest, AccessToSelfFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
shell(),
@@ -259,7 +259,7 @@
EXPECT_EQ(fail_string(), watcher->WaitAndGetTitle());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTest, AccessToAnotherFileUrl) {
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTest, AccessToAnotherFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
shell(),
@@ -270,7 +270,7 @@
EXPECT_EQ(fail_string(), watcher->WaitAndGetTitle());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithAllowFileAccessFromFiles,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithAllowFileAccessFromFiles,
AccessControlAllowOriginIsNull) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -283,7 +283,7 @@
EXPECT_TRUE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithAllowFileAccessFromFiles,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithAllowFileAccessFromFiles,
AccessControlAllowOriginIsFile) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -296,7 +296,7 @@
EXPECT_TRUE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithAllowFileAccessFromFiles,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithAllowFileAccessFromFiles,
AccessToSelfFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -308,7 +308,7 @@
EXPECT_EQ(pass_string(), watcher->WaitAndGetTitle());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithAllowFileAccessFromFiles,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithAllowFileAccessFromFiles,
AccessToAnotherFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -320,7 +320,7 @@
EXPECT_EQ(pass_string(), watcher->WaitAndGetTitle());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithDisableWebSecurity,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithDisableWebSecurity,
AccessControlAllowOriginIsNull) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -333,7 +333,7 @@
EXPECT_FALSE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithDisableWebSecurity,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithDisableWebSecurity,
AccessControlAllowOriginIsFile) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -346,7 +346,7 @@
EXPECT_FALSE(is_preflight_requested());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithDisableWebSecurity,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithDisableWebSecurity,
AccessToSelfFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -358,7 +358,7 @@
EXPECT_EQ(pass_string(), watcher->WaitAndGetTitle());
}
-IN_PROC_BROWSER_TEST_P(CORSFileOriginBrowserTestWithDisableWebSecurity,
+IN_PROC_BROWSER_TEST_P(CorsFileOriginBrowserTestWithDisableWebSecurity,
AccessToAnotherFileUrl) {
std::unique_ptr<TitleWatcher> watcher = CreateWatcher();
EXPECT_TRUE(NavigateToURL(
@@ -372,21 +372,21 @@
INSTANTIATE_TEST_CASE_P(
/* No test prefix */,
- CORSFileOriginBrowserTest,
+ CorsFileOriginBrowserTest,
::testing::Values(CorsTestMode::kInBlink,
CorsTestMode::kInBrowserProcess,
CorsTestMode::kInNetworkService));
INSTANTIATE_TEST_CASE_P(
/* No test prefix */,
- CORSFileOriginBrowserTestWithAllowFileAccessFromFiles,
+ CorsFileOriginBrowserTestWithAllowFileAccessFromFiles,
::testing::Values(CorsTestMode::kInBlink,
CorsTestMode::kInBrowserProcess,
CorsTestMode::kInNetworkService));
INSTANTIATE_TEST_CASE_P(
/* No test prefix */,
- CORSFileOriginBrowserTestWithDisableWebSecurity,
+ CorsFileOriginBrowserTestWithDisableWebSecurity,
::testing::Values(CorsTestMode::kInBlink,
CorsTestMode::kInBrowserProcess,
CorsTestMode::kInNetworkService));
diff --git a/content/browser/loader/cors_origin_access_list_browsertest.cc b/content/browser/loader/cors_origin_access_list_browsertest.cc
index 8f32876..984cc366 100644
--- a/content/browser/loader/cors_origin_access_list_browsertest.cc
+++ b/content/browser/loader/cors_origin_access_list_browsertest.cc
@@ -53,7 +53,7 @@
case TestMode::kOutOfBlinkCorsWithServicification:
scoped_feature_list_.InitWithFeatures(
// Enabled features
- {network::features::kOutOfBlinkCORS,
+ {network::features::kOutOfBlinkCors,
network::features::kNetworkService,
blink::features::kServiceWorkerServicification},
// Disabled features
@@ -62,7 +62,7 @@
case TestMode::kOutOfBlinkCorsWithoutServicification:
scoped_feature_list_.InitWithFeatures(
// Enabled features
- {network::features::kOutOfBlinkCORS},
+ {network::features::kOutOfBlinkCors},
// Disabled features
{network::features::kNetworkService,
blink::features::kServiceWorkerServicification});
@@ -105,7 +105,7 @@
std::vector<network::mojom::CorsOriginPatternPtr> list1;
list1.push_back(network::mojom::CorsOriginPattern::New(
scheme, host, allow_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
bool first_list_done = false;
BrowserContext::SetCorsOriginAccessListsForOrigin(
shell()->web_contents()->GetBrowserContext(),
@@ -117,7 +117,7 @@
std::vector<network::mojom::CorsOriginPatternPtr> list2;
list2.push_back(network::mojom::CorsOriginPattern::New(
scheme, host, allow_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
bool second_list_done = false;
BrowserContext::SetCorsOriginAccessListsForOrigin(
shell()->web_contents()->GetBrowserContext(),
@@ -277,7 +277,7 @@
CorsOriginAccessListBrowserTest,
::testing::Values(TestMode::kOutOfBlinkCorsWithoutServicification));
-// TODO(toyoshim): Instantiates tests for the case kOutOfBlinkCORS is disabled
+// TODO(toyoshim): Instantiates tests for the case kOutOfBlinkCors is disabled
// and remove relevant LayoutTests if it's possible.
} // namespace
diff --git a/content/browser/loader/cross_site_document_blocking_browsertest.cc b/content/browser/loader/cross_site_document_blocking_browsertest.cc
index ae4e2c95..b3d8810 100644
--- a/content/browser/loader/cross_site_document_blocking_browsertest.cc
+++ b/content/browser/loader/cross_site_document_blocking_browsertest.cc
@@ -402,11 +402,11 @@
switch (GetParam()) {
case TestMode::kWithoutOutOfBlinkCors:
scoped_feature_list_.InitAndDisableFeature(
- network::features::kOutOfBlinkCORS);
+ network::features::kOutOfBlinkCors);
break;
case TestMode::kWithOutOfBlinkCors:
scoped_feature_list_.InitAndEnableFeature(
- network::features::kOutOfBlinkCORS);
+ network::features::kOutOfBlinkCors);
break;
}
}
@@ -574,7 +574,7 @@
// Note: we want to verify that the blocking prevents the data from being sent
// over IPC. Testing later (e.g. via Response/Headers Web APIs) might give a
// false sense of security, since some sanitization happens inside the
- // renderer (e.g. via FetchResponseData::CreateCORSFilteredResponse).
+ // renderer (e.g. via FetchResponseData::CreateCorsFilteredResponse).
GURL bar_url("http://bar.com/cross_site_document_blocking/headers-test.json");
RequestInterceptor interceptor(bar_url);
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 35824ad..582c8da8 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1129,7 +1129,7 @@
// Add a handler to block cross-site documents from the renderer process.
bool is_nocors_plugin_request =
resource_type == RESOURCE_TYPE_PLUGIN_RESOURCE &&
- fetch_request_mode == network::mojom::FetchRequestMode::kNoCORS;
+ fetch_request_mode == network::mojom::FetchRequestMode::kNoCors;
handler.reset(new CrossSiteDocumentResourceHandler(
std::move(handler), request, is_nocors_plugin_request));
}
@@ -1574,12 +1574,12 @@
new_request.get(), this, std::move(url_loader_request),
std::move(url_loader_client), resource_type, url_loader_options);
- // Safe to consider navigations as kNoCORS.
+ // Safe to consider navigations as kNoCors.
// TODO(davidben): Fix the dependency on child_id/route_id. Those are used
// by the ResourceScheduler. currently it's a no-op.
handler = AddStandardHandlers(
new_request.get(), resource_type, resource_context,
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
info.begin_params->request_context_type, url_loader_options,
appcache_handle_core ? appcache_handle_core->GetAppCacheService()
: nullptr,
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 3c6703b..bc641dd 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -658,12 +658,12 @@
// Enabled features
{},
// Disabled features
- {network::features::kOutOfBlinkCORS});
+ {network::features::kOutOfBlinkCors});
break;
case TestMode::kWithOutOfBlinkCors:
scoped_feature_list_.InitWithFeatures(
// Enabled features
- {network::features::kOutOfBlinkCORS,
+ {network::features::kOutOfBlinkCors,
blink::features::kServiceWorkerServicification},
// Disabled features
{});
@@ -867,7 +867,7 @@
}
bool IsAborted(const network::TestURLLoaderClient& client) {
- // TODO(toyoshim): Once NetworkService or OutOfBlinkCORS is enabled, these
+ // TODO(toyoshim): Once NetworkService or OutOfBlinkCors is enabled, these
// expectations below should be receiving a completion with ERR_ABORTED.
if (!client.has_received_completion())
return client.has_received_connection_error();
diff --git a/content/browser/loader/resource_message_filter.cc b/content/browser/loader/resource_message_filter.cc
index faed15d..482c2c9 100644
--- a/content/browser/loader/resource_message_filter.cc
+++ b/content/browser/loader/resource_message_filter.cc
@@ -181,7 +181,7 @@
// The WeakPtr of the filter must be created on the IO thread. So sets the
// WeakPtr of |requester_info_| now.
requester_info_->set_filter(GetWeakPtr());
- url_loader_factory_ = std::make_unique<network::cors::CORSURLLoaderFactory>(
+ url_loader_factory_ = std::make_unique<network::cors::CorsURLLoaderFactory>(
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableWebSecurity),
std::make_unique<URLLoaderFactoryImpl>(requester_info_),
diff --git a/content/browser/manifest/manifest_browsertest.cc b/content/browser/manifest/manifest_browsertest.cc
index ba1a288..cc379af1 100644
--- a/content/browser/manifest/manifest_browsertest.cc
+++ b/content/browser/manifest/manifest_browsertest.cc
@@ -317,7 +317,7 @@
// If a page's manifest lives in a different origin, it should follow the CORS
// rules and requesting the manifest should return an empty manifest (unless the
// response contains CORS headers).
-IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifest) {
+IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CorsManifest) {
ASSERT_TRUE(cors_embedded_test_server()->Start());
ASSERT_NE(embedded_test_server()->port(),
cors_embedded_test_server()->port());
@@ -358,7 +358,7 @@
// If a page's manifest lives in a different origin, it should be accessible if
// it has valid access controls headers.
-IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifestWithAcessControls) {
+IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CorsManifestWithAcessControls) {
ASSERT_TRUE(cors_embedded_test_server()->Start());
ASSERT_NE(embedded_test_server()->port(),
cors_embedded_test_server()->port());
diff --git a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
index 086d992..1005271 100644
--- a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc
@@ -127,7 +127,7 @@
request, helper_->context_wrapper(), &blob_storage_context_,
helper_->mock_render_process_id(), provider_host_->provider_id(),
false /* skip_service_worker */,
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow,
std::string() /* integrity */, false /* keepalive */,
@@ -305,7 +305,7 @@
ServiceWorkerRequestHandler::InitializeHandler(
request.get(), helper_->context_wrapper(), &blob_storage_context_,
helper_->mock_render_process_id(), provider_host_->provider_id(),
- true /* skip_service_worker */, network::mojom::FetchRequestMode::kNoCORS,
+ true /* skip_service_worker */, network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow, std::string() /* integrity */,
false /* keepalive */, RESOURCE_TYPE_SERVICE_WORKER,
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
index 2b92849..b048cee 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
@@ -52,7 +52,7 @@
const GURL& url,
ResourceType type,
network::mojom::FetchRequestMode fetch_type =
- network::mojom::FetchRequestMode::kNoCORS)
+ network::mojom::FetchRequestMode::kNoCors)
: test_(test),
resource_type_(type),
request_(test->url_request_context_.CreateRequest(
@@ -462,7 +462,7 @@
// CORS request should be returned to renderer for CORS checking.
ServiceWorkerRequestTestResources sub_test_resources_cors(
this, GURL("https://host/scope/doc/subresource"), RESOURCE_TYPE_SCRIPT,
- network::mojom::FetchRequestMode::kCORS);
+ network::mojom::FetchRequestMode::kCors);
ServiceWorkerURLRequestJob* sub_cors_job =
sub_test_resources_cors.MaybeCreateJob();
diff --git a/content/browser/service_worker/service_worker_data_pipe_reader_unittest.cc b/content/browser/service_worker/service_worker_data_pipe_reader_unittest.cc
index dfe7d9f..2093ef5 100644
--- a/content/browser/service_worker/service_worker_data_pipe_reader_unittest.cc
+++ b/content/browser/service_worker/service_worker_data_pipe_reader_unittest.cc
@@ -36,7 +36,7 @@
"",
nullptr,
nullptr,
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow,
std::string() /* integrity */,
diff --git a/content/browser/service_worker/service_worker_request_handler_unittest.cc b/content/browser/service_worker/service_worker_request_handler_unittest.cc
index 963a3d0..8bf8f7e 100644
--- a/content/browser/service_worker/service_worker_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_request_handler_unittest.cc
@@ -99,7 +99,7 @@
ServiceWorkerRequestHandler::InitializeHandler(
request, context_wrapper(), &blob_storage_context_,
helper_->mock_render_process_id(), kMockProviderId, skip_service_worker,
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow,
std::string() /* integrity */, false /* keepalive */, resource_type,
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
index 4b443bd..ddc2fae 100644
--- a/content/browser/service_worker/service_worker_url_request_job.cc
+++ b/content/browser/service_worker/service_worker_url_request_job.cc
@@ -843,9 +843,9 @@
// It is because the CORS preflight logic is implemented in the renderer. So
// we return a fall_back_required response to the renderer.
return !IsMainResourceLoad() &&
- (request_mode_ == network::mojom::FetchRequestMode::kCORS ||
+ (request_mode_ == network::mojom::FetchRequestMode::kCors ||
request_mode_ ==
- network::mojom::FetchRequestMode::kCORSWithForcedPreflight) &&
+ network::mojom::FetchRequestMode::kCorsWithForcedPreflight) &&
(!request()->initiator().has_value() ||
!request()->initiator()->IsSameOriginWith(
url::Origin::Create(request()->url())));
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index f297013..4b65205 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -116,7 +116,7 @@
job_ = new ServiceWorkerURLRequestJob(
request, network_delegate, provider_host_->client_uuid(),
blob_storage_context_, resource_context_,
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow,
std::string() /* integrity */, false /* keepalive */, resource_type_,
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
index 16254748..683af59e 100644
--- a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
@@ -320,7 +320,7 @@
TRAFFIC_ANNOTATION_FOR_TESTS);
ServiceWorkerRequestHandler::InitializeHandler(
request_.get(), context_wrapper(), &blob_storage_context_, process_id,
- provider_id, false, network::mojom::FetchRequestMode::kNoCORS,
+ provider_id, false, network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kOmit,
network::mojom::FetchRedirectMode::kFollow,
std::string() /* integrity */, false /* keepalive */,
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 69ca28f..fcd5b23 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -347,8 +347,8 @@
if (base::FeatureList::IsEnabled(features::kGenericSensorExtraClasses))
WebRuntimeFeatures::EnableGenericSensorExtraClasses(true);
- if (base::FeatureList::IsEnabled(network::features::kOutOfBlinkCORS))
- WebRuntimeFeatures::EnableOutOfBlinkCORS(true);
+ if (base::FeatureList::IsEnabled(network::features::kOutOfBlinkCors))
+ WebRuntimeFeatures::EnableOutOfBlinkCors(true);
WebRuntimeFeatures::EnableMediaCastOverlayButton(
base::FeatureList::IsEnabled(media::kMediaCastOverlayButton));
diff --git a/content/common/service_worker/service_worker_types.h b/content/common/service_worker/service_worker_types.h
index 8c667bf..f2dab4fa 100644
--- a/content/common/service_worker/service_worker_types.h
+++ b/content/common/service_worker/service_worker_types.h
@@ -92,7 +92,7 @@
// Be sure to update EstimatedStructSize(), Serialize(), and ParseFromString()
// when adding members.
network::mojom::FetchRequestMode mode =
- network::mojom::FetchRequestMode::kNoCORS;
+ network::mojom::FetchRequestMode::kNoCors;
bool is_main_resource_load = false;
blink::mojom::RequestContextType request_context_type =
blink::mojom::RequestContextType::UNSPECIFIED;
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index 4113e33f..c922d97 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -79,7 +79,7 @@
schemes.cors_enabled_schemes.push_back(kChromeUIScheme);
for (auto& scheme : schemes.cors_enabled_schemes)
- url::AddCORSEnabledScheme(scheme.c_str());
+ url::AddCorsEnabledScheme(scheme.c_str());
// TODO(mkwst): Investigate whether chrome-error should be included in
// csp_bypassing_schemes.
diff --git a/content/renderer/fetchers/manifest_fetcher.cc b/content/renderer/fetchers/manifest_fetcher.cc
index 1b9794fd..942e3d5 100644
--- a/content/renderer/fetchers/manifest_fetcher.cc
+++ b/content/renderer/fetchers/manifest_fetcher.cc
@@ -36,7 +36,7 @@
// true, and "omit" otherwise.
fetcher_->Start(
frame, blink::mojom::RequestContextType::MANIFEST,
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
use_credentials ? network::mojom::FetchCredentialsMode::kInclude
: network::mojom::FetchCredentialsMode::kOmit,
network::mojom::RequestContextFrameType::kNone,
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
index d7436721..892dc9729 100644
--- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
+++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
@@ -55,7 +55,7 @@
fetcher_->SetCacheMode(cache_mode);
fetcher_->Start(
- frame, request_context, network::mojom::FetchRequestMode::kNoCORS,
+ frame, request_context, network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kInclude,
network::mojom::RequestContextFrameType::kNone,
base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete,
diff --git a/content/renderer/loader/resource_dispatcher_unittest.cc b/content/renderer/loader/resource_dispatcher_unittest.cc
index 0e32a601..c32ad585 100644
--- a/content/renderer/loader/resource_dispatcher_unittest.cc
+++ b/content/renderer/loader/resource_dispatcher_unittest.cc
@@ -97,7 +97,7 @@
request->referrer_policy = Referrer::GetDefaultReferrerPolicy();
request->resource_type = RESOURCE_TYPE_SUB_RESOURCE;
request->priority = net::LOW;
- request->fetch_request_mode = network::mojom::FetchRequestMode::kNoCORS;
+ request->fetch_request_mode = network::mojom::FetchRequestMode::kNoCors;
request->fetch_frame_type = network::mojom::RequestContextFrameType::kNone;
const RequestExtraData extra_data;
diff --git a/content/renderer/loader/sync_load_response.h b/content/renderer/loader/sync_load_response.h
index df5a86cf..882cadf 100644
--- a/content/renderer/loader/sync_load_response.h
+++ b/content/renderer/loader/sync_load_response.h
@@ -40,7 +40,7 @@
int extended_error_code = 0;
// Optional CORS error details.
- base::Optional<network::CORSErrorStatus> cors_error;
+ base::Optional<network::CorsErrorStatus> cors_error;
// The final URL of the response. This may differ from the request URL in
// the case of a server redirect.
diff --git a/content/renderer/loader/url_response_body_consumer_unittest.cc b/content/renderer/loader/url_response_body_consumer_unittest.cc
index da8380d..7def49e 100644
--- a/content/renderer/loader/url_response_body_consumer_unittest.cc
+++ b/content/renderer/loader/url_response_body_consumer_unittest.cc
@@ -131,7 +131,7 @@
request->url = GURL("http://www.example.com/");
request->priority = net::LOW;
request->appcache_host_id = 0;
- request->fetch_request_mode = network::mojom::FetchRequestMode::kNoCORS;
+ request->fetch_request_mode = network::mojom::FetchRequestMode::kNoCors;
request->fetch_frame_type = network::mojom::RequestContextFrameType::kNone;
const RequestExtraData extra_data;
diff --git a/content/renderer/loader/web_url_loader_impl.cc b/content/renderer/loader/web_url_loader_impl.cc
index 44fb52c..4a2ff50 100644
--- a/content/renderer/loader/web_url_loader_impl.cc
+++ b/content/renderer/loader/web_url_loader_impl.cc
@@ -700,7 +700,7 @@
resource_request->appcache_host_id = request.AppCacheHostID();
resource_request->should_reset_appcache = request.ShouldResetAppCache();
resource_request->is_external_request = request.IsExternalRequest();
- resource_request->cors_preflight_policy = request.GetCORSPreflightPolicy();
+ resource_request->cors_preflight_policy = request.GetCorsPreflightPolicy();
resource_request->skip_service_worker = request.GetSkipServiceWorker();
resource_request->fetch_request_mode = request.GetFetchRequestMode();
resource_request->fetch_credentials_mode = request.GetFetchCredentialsMode();
diff --git a/content/renderer/media/stream/webmediaplayer_ms.cc b/content/renderer/media/stream/webmediaplayer_ms.cc
index 634c70eb..4933e43 100644
--- a/content/renderer/media/stream/webmediaplayer_ms.cc
+++ b/content/renderer/media/stream/webmediaplayer_ms.cc
@@ -309,7 +309,7 @@
blink::WebMediaPlayer::LoadTiming WebMediaPlayerMS::Load(
LoadType load_type,
const blink::WebMediaPlayerSource& source,
- CORSMode /*cors_mode*/) {
+ CorsMode /*cors_mode*/) {
DVLOG(1) << __func__;
DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/content/renderer/media/stream/webmediaplayer_ms.h b/content/renderer/media/stream/webmediaplayer_ms.h
index e26faac..e4d8de8 100644
--- a/content/renderer/media/stream/webmediaplayer_ms.h
+++ b/content/renderer/media/stream/webmediaplayer_ms.h
@@ -101,7 +101,7 @@
blink::WebMediaPlayer::LoadTiming Load(
LoadType load_type,
const blink::WebMediaPlayerSource& source,
- CORSMode cors_mode) override;
+ CorsMode cors_mode) override;
// WebSurfaceLayerBridgeObserver implementation.
void OnWebLayerUpdated() override;
diff --git a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
index f424353..90bc2ab 100644
--- a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
@@ -719,7 +719,7 @@
blink::WebMediaPlayer::kReadyStateHaveNothing));
player_->Load(blink::WebMediaPlayer::kLoadTypeURL,
blink::WebMediaPlayerSource(),
- blink::WebMediaPlayer::kCORSModeUnspecified);
+ blink::WebMediaPlayer::kCorsModeUnspecified);
compositor_ = player_->compositor_.get();
EXPECT_TRUE(!!compositor_);
compositor_->SetAlgorithmEnabledForTesting(algorithm_enabled);
@@ -866,7 +866,7 @@
player_->Load(blink::WebMediaPlayer::kLoadTypeURL,
blink::WebMediaPlayerSource(),
- blink::WebMediaPlayer::kCORSModeUnspecified);
+ blink::WebMediaPlayer::kCorsModeUnspecified);
message_loop_controller_.RunAndWaitForStatus(
media::PipelineStatus::PIPELINE_OK);
diff --git a/content/renderer/media_capture_from_element/html_video_element_capturer_source_unittest.cc b/content/renderer/media_capture_from_element/html_video_element_capturer_source_unittest.cc
index ef834677e..f11a184 100644
--- a/content/renderer/media_capture_from_element/html_video_element_capturer_source_unittest.cc
+++ b/content/renderer/media_capture_from_element/html_video_element_capturer_source_unittest.cc
@@ -39,7 +39,7 @@
LoadTiming Load(LoadType,
const blink::WebMediaPlayerSource&,
- CORSMode) override {
+ CorsMode) override {
return LoadTiming::kImmediate;
}
void Play() override {}
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc
index 43807f48..52556e5 100644
--- a/content/renderer/pepper/pepper_url_loader_host.cc
+++ b/content/renderer/pepper/pepper_url_loader_host.cc
@@ -268,7 +268,7 @@
if (filled_in_request_data.allow_cross_origin_requests) {
// Allow cross-origin requests with access control. The request specifies
// if credentials are to be sent.
- web_request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ web_request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
web_request.SetFetchCredentialsMode(
filled_in_request_data.allow_credentials
? network::mojom::FetchCredentialsMode::kInclude
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.cc b/content/renderer/service_worker/service_worker_subresource_loader.cc
index e9b70504..0292d64 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader.cc
+++ b/content/renderer/service_worker/service_worker_subresource_loader.cc
@@ -388,9 +388,9 @@
// response to Blink.
// TODO(falken): Remove this mechanism after OOB-CORS ships.
if ((resource_request_.fetch_request_mode ==
- network::mojom::FetchRequestMode::kCORS ||
+ network::mojom::FetchRequestMode::kCors ||
resource_request_.fetch_request_mode ==
- network::mojom::FetchRequestMode::kCORSWithForcedPreflight) &&
+ network::mojom::FetchRequestMode::kCorsWithForcedPreflight) &&
(!resource_request_.request_initiator.has_value() ||
!resource_request_.request_initiator->IsSameOriginWith(
url::Origin::Create(resource_request_.url)))) {
diff --git a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
index a824580..c27a10d 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
+++ b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
@@ -575,7 +575,7 @@
// TODO(falken): It'd be nicer to also check the request body was sent to
// network but it requires more complicated network mocking and it was hard
// getting EmbeddedTestServer working with these tests (probably
- // CORSFallbackResponse is too heavy). We also have Web Platform Tests that
+ // CorsFallbackResponse is too heavy). We also have Web Platform Tests that
// cover this case in fetch-event.https.html.
}
@@ -1260,7 +1260,7 @@
}
// Test when the service worker responds with network fallback to CORS request.
-TEST_F(ServiceWorkerSubresourceLoaderTest, CORSFallbackResponse) {
+TEST_F(ServiceWorkerSubresourceLoaderTest, CorsFallbackResponse) {
fake_controller_.RespondWithFallback();
network::mojom::URLLoaderFactoryPtr factory =
@@ -1274,31 +1274,31 @@
const TestCase kTests[] = {
{network::mojom::FetchRequestMode::kSameOrigin,
base::Optional<url::Origin>(), false},
- {network::mojom::FetchRequestMode::kNoCORS, base::Optional<url::Origin>(),
+ {network::mojom::FetchRequestMode::kNoCors, base::Optional<url::Origin>(),
false},
- {network::mojom::FetchRequestMode::kCORS, base::Optional<url::Origin>(),
+ {network::mojom::FetchRequestMode::kCors, base::Optional<url::Origin>(),
true},
- {network::mojom::FetchRequestMode::kCORSWithForcedPreflight,
+ {network::mojom::FetchRequestMode::kCorsWithForcedPreflight,
base::Optional<url::Origin>(), true},
{network::mojom::FetchRequestMode::kNavigate,
base::Optional<url::Origin>(), false},
{network::mojom::FetchRequestMode::kSameOrigin,
url::Origin::Create(GURL("https://www.example.com/")), false},
- {network::mojom::FetchRequestMode::kNoCORS,
+ {network::mojom::FetchRequestMode::kNoCors,
url::Origin::Create(GURL("https://www.example.com/")), false},
- {network::mojom::FetchRequestMode::kCORS,
+ {network::mojom::FetchRequestMode::kCors,
url::Origin::Create(GURL("https://www.example.com/")), false},
- {network::mojom::FetchRequestMode::kCORSWithForcedPreflight,
+ {network::mojom::FetchRequestMode::kCorsWithForcedPreflight,
url::Origin::Create(GURL("https://www.example.com/")), false},
{network::mojom::FetchRequestMode::kNavigate,
url::Origin::Create(GURL("https://other.example.com/")), false},
{network::mojom::FetchRequestMode::kSameOrigin,
url::Origin::Create(GURL("https://other.example.com/")), false},
- {network::mojom::FetchRequestMode::kNoCORS,
+ {network::mojom::FetchRequestMode::kNoCors,
url::Origin::Create(GURL("https://other.example.com/")), false},
- {network::mojom::FetchRequestMode::kCORS,
+ {network::mojom::FetchRequestMode::kCors,
url::Origin::Create(GURL("https://other.example.com/")), true},
- {network::mojom::FetchRequestMode::kCORSWithForcedPreflight,
+ {network::mojom::FetchRequestMode::kCorsWithForcedPreflight,
url::Origin::Create(GURL("https://other.example.com/")), true},
{network::mojom::FetchRequestMode::kNavigate,
url::Origin::Create(GURL("https://other.example.com/")), false}};
diff --git a/content/shell/test_runner/test_runner.cc b/content/shell/test_runner/test_runner.cc
index afa3163c..7986887 100644
--- a/content/shell/test_runner/test_runner.cc
+++ b/content/shell/test_runner/test_runner.cc
@@ -2118,7 +2118,7 @@
url, blink::WebString::FromUTF8(destination_protocol),
blink::WebString::FromUTF8(destination_host),
allow_destination_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
}
void TestRunner::SetTextSubpixelPositioning(bool value) {
diff --git a/extensions/common/cors_util.cc b/extensions/common/cors_util.cc
index c058cfa..e2688a1 100644
--- a/extensions/common/cors_util.cc
+++ b/extensions/common/cors_util.cc
@@ -20,7 +20,7 @@
void AddURLPatternSetToList(
const URLPatternSet& pattern_set,
std::vector<network::mojom::CorsOriginPatternPtr>* list,
- network::mojom::CORSOriginAccessMatchPriority priority) {
+ network::mojom::CorsOriginAccessMatchPriority priority) {
static const char* const kSchemes[] = {
content::kChromeUIScheme,
#if defined(OS_CHROMEOS)
@@ -53,7 +53,7 @@
extension.permissions_data()->GetEffectiveHostPermissions();
AddURLPatternSetToList(
origin_permissions, &allow_list,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
// Hosts exempted from the enterprise policy blocklist.
// This set intersection is necessary to prevent an enterprise policy from
@@ -64,7 +64,7 @@
origin_permissions, URLPatternSet::IntersectionBehavior::kDetailed);
AddURLPatternSetToList(
policy_allowed_host_patterns, &allow_list,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
return allow_list;
}
@@ -76,12 +76,12 @@
// Hosts blocked by enterprise policy.
AddURLPatternSetToList(
extension.permissions_data()->policy_blocked_hosts(), &block_list,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
GURL webstore_launch_url = extension_urls::GetWebstoreLaunchURL();
block_list.push_back(network::mojom::CorsOriginPattern::New(
webstore_launch_url.scheme(), webstore_launch_url.host(), true,
- network::mojom::CORSOriginAccessMatchPriority::kHighPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kHighPriority));
// TODO(devlin): Should we also block the webstore update URL here? See
// https://crbug.com/826946 for a related instance.
diff --git a/media/blink/multibuffer_data_source.cc b/media/blink/multibuffer_data_source.cc
index 9571a014..0c99bb24 100644
--- a/media/blink/multibuffer_data_source.cc
+++ b/media/blink/multibuffer_data_source.cc
@@ -290,7 +290,7 @@
return url_data()->is_cors_cross_origin();
}
-UrlData::CORSMode MultibufferDataSource::cors_mode() const {
+UrlData::CorsMode MultibufferDataSource::cors_mode() const {
return url_data()->cors_mode();
}
diff --git a/media/blink/multibuffer_data_source.h b/media/blink/multibuffer_data_source.h
index 52d0d443..8a938b7 100644
--- a/media/blink/multibuffer_data_source.h
+++ b/media/blink/multibuffer_data_source.h
@@ -83,8 +83,8 @@
// This must be called after the response arrives.
bool IsCorsCrossOrigin() const;
- // Returns the CORSMode of the underlying UrlData.
- UrlData::CORSMode cors_mode() const;
+ // Returns the CorsMode of the underlying UrlData.
+ UrlData::CorsMode cors_mode() const;
// Notifies changes in playback state for controlling media buffering
// behavior.
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index 4b9f83e7..6bf7d48 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -114,7 +114,7 @@
class TestUrlData : public UrlData {
public:
- TestUrlData(const GURL& url, CORSMode cors_mode, UrlIndex* url_index)
+ TestUrlData(const GURL& url, CorsMode cors_mode, UrlIndex* url_index)
: UrlData(url, cors_mode, url_index),
block_shift_(url_index->block_shift()) {}
@@ -145,7 +145,7 @@
: UrlIndex(fetch_context) {}
scoped_refptr<UrlData> NewUrlData(const GURL& url,
- UrlData::CORSMode cors_mode) override {
+ UrlData::CorsMode cors_mode) override {
last_url_data_ = new TestUrlData(url, cors_mode, this);
return last_url_data_;
}
@@ -223,9 +223,9 @@
MOCK_METHOD1(OnInitialize, void(bool));
- void InitializeWithCORS(const char* url,
+ void InitializeWithCors(const char* url,
bool expected,
- UrlData::CORSMode cors_mode,
+ UrlData::CorsMode cors_mode,
size_t file_size = kFileSize) {
GURL gurl(url);
data_source_.reset(new MockMultibufferDataSource(
@@ -246,7 +246,7 @@
void Initialize(const char* url,
bool expected,
size_t file_size = kFileSize) {
- InitializeWithCORS(url, expected, UrlData::CORS_UNSPECIFIED, file_size);
+ InitializeWithCors(url, expected, UrlData::CORS_UNSPECIFIED, file_size);
}
// Helper to initialize tests with a valid 200 response.
@@ -782,8 +782,8 @@
}
TEST_F(MultibufferDataSourceTest,
- Http_MixedResponse_ServiceWorkerProxiedAndDifferentOriginResponseCORS) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ Http_MixedResponse_ServiceWorkerProxiedAndDifferentOriginResponseCors) {
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
response1.SetWasFetchedViaServiceWorker(true);
@@ -1494,7 +1494,7 @@
}
TEST_F(MultibufferDataSourceTest, ResponseTypeBasic) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
set_preload(MultibufferDataSource::NONE);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
@@ -1514,11 +1514,11 @@
}
TEST_F(MultibufferDataSourceTest, ResponseTypeCors) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
set_preload(MultibufferDataSource::NONE);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
- response1.SetType(network::mojom::FetchResponseType::kCORS);
+ response1.SetType(network::mojom::FetchResponseType::kCors);
EXPECT_CALL(host_, SetTotalBytes(kFileSize));
EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize));
@@ -1534,7 +1534,7 @@
}
TEST_F(MultibufferDataSourceTest, ResponseTypeDefault) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
set_preload(MultibufferDataSource::NONE);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
@@ -1554,7 +1554,7 @@
}
TEST_F(MultibufferDataSourceTest, ResponseTypeOpaque) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
set_preload(MultibufferDataSource::NONE);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
@@ -1574,7 +1574,7 @@
}
TEST_F(MultibufferDataSourceTest, ResponseTypeOpaqueRedirect) {
- InitializeWithCORS(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
+ InitializeWithCors(kHttpUrl, true, UrlData::CORS_ANONYMOUS);
set_preload(MultibufferDataSource::NONE);
WebURLResponse response1 =
response_generator_->GeneratePartial206(0, kDataSize - 1);
diff --git a/media/blink/resource_multibuffer_data_provider.cc b/media/blink/resource_multibuffer_data_provider.cc
index 8363162..01c6baf 100644
--- a/media/blink/resource_multibuffer_data_provider.cc
+++ b/media/blink/resource_multibuffer_data_provider.cc
@@ -115,9 +115,9 @@
options.expose_all_response_headers = true;
// The author header set is empty, no preflight should go ahead.
options.preflight_policy =
- network::mojom::CORSPreflightPolicy::kPreventPreflight;
+ network::mojom::CorsPreflightPolicy::kPreventPreflight;
- request->SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request->SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
if (url_data_->cors_mode() != UrlData::CORS_USE_CREDENTIALS) {
request->SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kSameOrigin);
@@ -337,7 +337,7 @@
// This is vital for security!
destination_url_data->set_is_cors_cross_origin(
- network::cors::IsCORSCrossOriginResponseType(response_type));
+ network::cors::IsCorsCrossOriginResponseType(response_type));
if (destination_url_data != url_data_) {
// At this point, we've encountered a redirect, or found a better url data
diff --git a/media/blink/resource_multibuffer_data_provider.h b/media/blink/resource_multibuffer_data_provider.h
index 5c24d194..484f79a 100644
--- a/media/blink/resource_multibuffer_data_provider.h
+++ b/media/blink/resource_multibuffer_data_provider.h
@@ -111,7 +111,7 @@
// Copy of url_data_->cors_mode()
// const to make it obvious that redirects cannot change it.
- const UrlData::CORSMode cors_mode_;
+ const UrlData::CorsMode cors_mode_;
// The origin for the initial request.
// const to make it obvious that redirects cannot change it.
diff --git a/media/blink/url_index.cc b/media/blink/url_index.cc
index 281e884d..dc9fd33 100644
--- a/media/blink/url_index.cc
+++ b/media/blink/url_index.cc
@@ -57,7 +57,7 @@
url_data_->OnEmpty();
}
-UrlData::UrlData(const GURL& url, CORSMode cors_mode, UrlIndex* url_index)
+UrlData::UrlData(const GURL& url, CorsMode cors_mode, UrlIndex* url_index)
: url_(url),
have_data_origin_(false),
cors_mode_(cors_mode),
@@ -77,7 +77,7 @@
DCHECK_EQ(0, preloading_);
}
-std::pair<GURL, UrlData::CORSMode> UrlData::key() const {
+std::pair<GURL, UrlData::CorsMode> UrlData::key() const {
DCHECK(thread_checker_.CalledOnValidThread());
return std::make_pair(url(), cors_mode());
}
@@ -399,7 +399,7 @@
}
scoped_refptr<UrlData> UrlIndex::GetByUrl(const GURL& gurl,
- UrlData::CORSMode cors_mode) {
+ UrlData::CorsMode cors_mode) {
auto i = indexed_data_.find(std::make_pair(gurl, cors_mode));
if (i != indexed_data_.end() && i->second->Valid()) {
return i->second;
@@ -409,7 +409,7 @@
}
scoped_refptr<UrlData> UrlIndex::NewUrlData(const GURL& url,
- UrlData::CORSMode cors_mode) {
+ UrlData::CorsMode cors_mode) {
return new UrlData(url, cors_mode, this);
}
diff --git a/media/blink/url_index.h b/media/blink/url_index.h
index 1ed80606c..4b0ede7 100644
--- a/media/blink/url_index.h
+++ b/media/blink/url_index.h
@@ -57,9 +57,9 @@
// Data is cached using a MultiBuffer instance.
class MEDIA_BLINK_EXPORT UrlData : public base::RefCounted<UrlData> {
public:
- // Keep in sync with WebMediaPlayer::CORSMode.
- enum CORSMode { CORS_UNSPECIFIED, CORS_ANONYMOUS, CORS_USE_CREDENTIALS };
- typedef std::pair<GURL, CORSMode> KeyType;
+ // Keep in sync with WebMediaPlayer::CorsMode.
+ enum CorsMode { CORS_UNSPECIFIED, CORS_ANONYMOUS, CORS_USE_CREDENTIALS };
+ typedef std::pair<GURL, CorsMode> KeyType;
// UrlData keeps track of how many clients are preloading or
// playing from this resource. This class encapsulates the
@@ -90,7 +90,7 @@
const GURL& url() const { return url_; }
// Cross-origin access mode
- CORSMode cors_mode() const { return cors_mode_; }
+ CorsMode cors_mode() const { return cors_mode_; }
// Are HTTP range requests supported?
bool range_supported() const { return range_supported_; }
@@ -188,7 +188,7 @@
void WaitToLoad(base::OnceClosure cb);
protected:
- UrlData(const GURL& url, CORSMode cors_mode, UrlIndex* url_index);
+ UrlData(const GURL& url, CorsMode cors_mode, UrlIndex* url_index);
virtual ~UrlData();
private:
@@ -227,7 +227,7 @@
bool have_data_origin_;
// Cross-origin access mode.
- const CORSMode cors_mode_;
+ const CorsMode cors_mode_;
UrlIndex* const url_index_;
@@ -299,7 +299,7 @@
// Because the returned UrlData has a raw reference to |this|, it must be
// released before |this| is destroyed.
scoped_refptr<UrlData> GetByUrl(const GURL& gurl,
- UrlData::CORSMode cors_mode);
+ UrlData::CorsMode cors_mode);
// Add the given UrlData to the index if possible. If a better UrlData
// is already present in the index, return it instead. (If not, we just
@@ -343,7 +343,7 @@
// Virtual so we can override it in tests.
virtual scoped_refptr<UrlData> NewUrlData(const GURL& url,
- UrlData::CORSMode cors_mode);
+ UrlData::CorsMode cors_mode);
void OnMemoryPressure(
base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
diff --git a/media/blink/url_index_unittest.cc b/media/blink/url_index_unittest.cc
index 391b055..01d53a5 100644
--- a/media/blink/url_index_unittest.cc
+++ b/media/blink/url_index_unittest.cc
@@ -23,7 +23,7 @@
UrlIndexTest() : url_index_(nullptr) {}
scoped_refptr<UrlData> GetByUrl(const GURL& gurl,
- UrlData::CORSMode cors_mode) {
+ UrlData::CorsMode cors_mode) {
scoped_refptr<UrlData> ret = url_index_.GetByUrl(gurl, cors_mode);
EXPECT_EQ(ret->url(), gurl);
EXPECT_EQ(ret->cors_mode(), cors_mode);
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 9230041a..c4c3075 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -214,10 +214,10 @@
class BufferedDataSourceHostImpl;
-STATIC_ASSERT_ENUM(WebMediaPlayer::kCORSModeUnspecified,
+STATIC_ASSERT_ENUM(WebMediaPlayer::kCorsModeUnspecified,
UrlData::CORS_UNSPECIFIED);
-STATIC_ASSERT_ENUM(WebMediaPlayer::kCORSModeAnonymous, UrlData::CORS_ANONYMOUS);
-STATIC_ASSERT_ENUM(WebMediaPlayer::kCORSModeUseCredentials,
+STATIC_ASSERT_ENUM(WebMediaPlayer::kCorsModeAnonymous, UrlData::CORS_ANONYMOUS);
+STATIC_ASSERT_ENUM(WebMediaPlayer::kCorsModeUseCredentials,
UrlData::CORS_USE_CREDENTIALS);
WebMediaPlayerImpl::WebMediaPlayerImpl(
@@ -418,7 +418,7 @@
WebMediaPlayer::LoadTiming WebMediaPlayerImpl::Load(
LoadType load_type,
const blink::WebMediaPlayerSource& source,
- CORSMode cors_mode) {
+ CorsMode cors_mode) {
DVLOG(1) << __func__;
// Only URL or MSE blob URL is supported.
DCHECK(source.IsURL());
@@ -590,7 +590,7 @@
void WebMediaPlayerImpl::DoLoad(LoadType load_type,
const blink::WebURL& url,
- CORSMode cors_mode) {
+ CorsMode cors_mode) {
TRACE_EVENT1("media", "WebMediaPlayerImpl::DoLoad", "id", media_log_->id());
DVLOG(1) << __func__;
DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -633,7 +633,7 @@
StartPipeline();
} else {
auto url_data =
- url_index_->GetByUrl(url, static_cast<UrlData::CORSMode>(cors_mode));
+ url_index_->GetByUrl(url, static_cast<UrlData::CorsMode>(cors_mode));
// Notify |this| of bytes received by the network.
url_data->AddBytesReceivedCallback(BindToCurrentLoop(base::BindRepeating(
&WebMediaPlayerImpl::OnBytesReceived, AsWeakPtr())));
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index e256fcc..2eca96f 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -126,7 +126,7 @@
WebMediaPlayer::LoadTiming Load(LoadType load_type,
const blink::WebMediaPlayerSource& source,
- CORSMode cors_mode) override;
+ CorsMode cors_mode) override;
// Playback controls.
void Play() override;
@@ -369,9 +369,7 @@
// Called after |defer_load_cb_| has decided to allow the load. If
// |defer_load_cb_| is null this is called immediately.
- void DoLoad(LoadType load_type,
- const blink::WebURL& url,
- CORSMode cors_mode);
+ void DoLoad(LoadType load_type, const blink::WebURL& url, CorsMode cors_mode);
// Called after asynchronous initialization of a data source completed.
void DataSourceInitialized(bool success);
diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc
index f237769..63a42d67 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -623,7 +623,7 @@
wmpi_->Load(blink::WebMediaPlayer::kLoadTypeURL,
blink::WebMediaPlayerSource(blink::WebURL(kTestURL)),
- blink::WebMediaPlayer::kCORSModeUnspecified);
+ blink::WebMediaPlayer::kCorsModeUnspecified);
base::RunLoop().RunUntilIdle();
diff --git a/net/reporting/reporting_uploader_unittest.cc b/net/reporting/reporting_uploader_unittest.cc
index 04c8155..1cf86c90 100644
--- a/net/reporting/reporting_uploader_unittest.cc
+++ b/net/reporting/reporting_uploader_unittest.cc
@@ -244,7 +244,7 @@
return std::move(response);
}
-TEST_F(ReportingUploaderTest, FailedCORSPreflight) {
+TEST_F(ReportingUploaderTest, FailedCorsPreflight) {
server_.RegisterRequestHandler(base::BindRepeating(&ReturnPreflightError));
server_.RegisterRequestHandler(base::BindRepeating(&ReturnResponse, HTTP_OK));
ASSERT_TRUE(server_.Start());
@@ -273,7 +273,7 @@
return std::move(response);
}
-TEST_F(ReportingUploaderTest, CORSPreflightWithoutOrigin) {
+TEST_F(ReportingUploaderTest, CorsPreflightWithoutOrigin) {
server_.RegisterRequestHandler(
base::BindRepeating(&ReturnPreflightWithoutOrigin));
server_.RegisterRequestHandler(base::BindRepeating(&ReturnResponse, HTTP_OK));
@@ -303,7 +303,7 @@
return std::move(response);
}
-TEST_F(ReportingUploaderTest, CORSPreflightWithoutMethods) {
+TEST_F(ReportingUploaderTest, CorsPreflightWithoutMethods) {
server_.RegisterRequestHandler(
base::BindRepeating(&ReturnPreflightWithoutMethods));
server_.RegisterRequestHandler(base::BindRepeating(&ReturnResponse, HTTP_OK));
@@ -333,7 +333,7 @@
return std::move(response);
}
-TEST_F(ReportingUploaderTest, CORSPreflightWithoutHeaders) {
+TEST_F(ReportingUploaderTest, CorsPreflightWithoutHeaders) {
server_.RegisterRequestHandler(
base::BindRepeating(&ReturnPreflightWithoutHeaders));
server_.RegisterRequestHandler(base::BindRepeating(&ReturnResponse, HTTP_OK));
diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
index 48f5d700..e76bcea 100644
--- a/services/network/cors/cors_url_loader.cc
+++ b/services/network/cors/cors_url_loader.cc
@@ -18,33 +18,33 @@
namespace {
bool NeedsPreflight(const ResourceRequest& request) {
- if (!IsCORSEnabledRequestMode(request.fetch_request_mode))
+ if (!IsCorsEnabledRequestMode(request.fetch_request_mode))
return false;
if (request.is_external_request)
return true;
if (request.fetch_request_mode ==
- mojom::FetchRequestMode::kCORSWithForcedPreflight) {
+ mojom::FetchRequestMode::kCorsWithForcedPreflight) {
return true;
}
if (request.cors_preflight_policy ==
- mojom::CORSPreflightPolicy::kPreventPreflight) {
+ mojom::CorsPreflightPolicy::kPreventPreflight) {
return false;
}
- if (!IsCORSSafelistedMethod(request.method))
+ if (!IsCorsSafelistedMethod(request.method))
return true;
- return !CORSUnsafeNotForbiddenRequestHeaderNames(
+ return !CorsUnsafeNotForbiddenRequestHeaderNames(
request.headers.GetHeaderVector(), request.is_revalidating)
.empty();
}
} // namespace
-CORSURLLoader::CORSURLLoader(
+CorsURLLoader::CorsURLLoader(
mojom::URLLoaderRequest loader_request,
int32_t routing_id,
int32_t request_id,
@@ -72,22 +72,22 @@
preflight_controller_(preflight_controller),
weak_factory_(this) {
binding_.set_connection_error_handler(base::BindOnce(
- &CORSURLLoader::OnConnectionError, base::Unretained(this)));
+ &CorsURLLoader::OnConnectionError, base::Unretained(this)));
DCHECK(network_loader_factory_);
DCHECK(origin_access_list_);
DCHECK(preflight_controller_);
- SetCORSFlagIfNeeded();
+ SetCorsFlagIfNeeded();
}
-CORSURLLoader::~CORSURLLoader() {
+CorsURLLoader::~CorsURLLoader() {
// Close pipes first to ignore possible subsequent callback invocations
// cased by |network_loader_|
network_client_binding_.Close();
}
-void CORSURLLoader::Start() {
+void CorsURLLoader::Start() {
if (fetch_cors_flag_ &&
- IsCORSEnabledRequestMode(request_.fetch_request_mode)) {
+ IsCorsEnabledRequestMode(request_.fetch_request_mode)) {
// Username and password should be stripped in a CORS-enabled request.
if (request_.url.has_username() || request_.url.has_password()) {
GURL::Replacements replacements;
@@ -99,7 +99,7 @@
StartRequest();
}
-void CORSURLLoader::FollowRedirect(
+void CorsURLLoader::FollowRedirect(
const base::Optional<std::vector<std::string>>&
to_be_removed_request_headers,
const base::Optional<net::HttpRequestHeaders>& modified_request_headers) {
@@ -134,7 +134,7 @@
request_.request_body = nullptr;
const bool original_fetch_cors_flag = fetch_cors_flag_;
- SetCORSFlagIfNeeded();
+ SetCorsFlagIfNeeded();
// We cannot use FollowRedirect for a request with preflight (i.e., when both
// |fetch_cors_flag_| and |NeedsPreflight(request_)| are true).
@@ -155,7 +155,7 @@
modified_request_headers);
return;
}
- DCHECK_NE(request_.fetch_request_mode, mojom::FetchRequestMode::kNoCORS);
+ DCHECK_NE(request_.fetch_request_mode, mojom::FetchRequestMode::kNoCors);
if (request_finalizer_)
request_finalizer_.Run(request_id_);
@@ -164,27 +164,27 @@
StartRequest();
}
-void CORSURLLoader::ProceedWithResponse() {
+void CorsURLLoader::ProceedWithResponse() {
NOTREACHED();
}
-void CORSURLLoader::SetPriority(net::RequestPriority priority,
+void CorsURLLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (network_loader_)
network_loader_->SetPriority(priority, intra_priority_value);
}
-void CORSURLLoader::PauseReadingBodyFromNet() {
+void CorsURLLoader::PauseReadingBodyFromNet() {
if (network_loader_)
network_loader_->PauseReadingBodyFromNet();
}
-void CORSURLLoader::ResumeReadingBodyFromNet() {
+void CorsURLLoader::ResumeReadingBodyFromNet() {
if (network_loader_)
network_loader_->ResumeReadingBodyFromNet();
}
-void CORSURLLoader::OnReceiveResponse(
+void CorsURLLoader::OnReceiveResponse(
const ResourceResponseHead& response_head) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
@@ -211,7 +211,7 @@
forwarding_client_->OnReceiveResponse(response_head_to_pass);
}
-void CORSURLLoader::OnReceiveRedirect(
+void CorsURLLoader::OnReceiveRedirect(
const net::RedirectInfo& redirect_info,
const ResourceResponseHead& response_head) {
DCHECK(network_loader_);
@@ -227,7 +227,7 @@
// If |CORS flag| is set and a CORS check for |request| and |response| returns
// failure, then return a network error.
if (fetch_cors_flag_ &&
- IsCORSEnabledRequestMode(request_.fetch_request_mode)) {
+ IsCorsEnabledRequestMode(request_.fetch_request_mode)) {
const auto error_status = CheckAccess(
request_.url, response_head.headers->response_code(),
GetHeaderString(response_head, header_names::kAccessControlAllowOrigin),
@@ -301,7 +301,7 @@
forwarding_client_->OnReceiveRedirect(redirect_info, response_head_to_pass);
}
-void CORSURLLoader::OnUploadProgress(int64_t current_position,
+void CorsURLLoader::OnUploadProgress(int64_t current_position,
int64_t total_size,
OnUploadProgressCallback ack_callback) {
DCHECK(network_loader_);
@@ -311,21 +311,21 @@
std::move(ack_callback));
}
-void CORSURLLoader::OnReceiveCachedMetadata(const std::vector<uint8_t>& data) {
+void CorsURLLoader::OnReceiveCachedMetadata(const std::vector<uint8_t>& data) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
DCHECK(!is_waiting_follow_redirect_call_);
forwarding_client_->OnReceiveCachedMetadata(data);
}
-void CORSURLLoader::OnTransferSizeUpdated(int32_t transfer_size_diff) {
+void CorsURLLoader::OnTransferSizeUpdated(int32_t transfer_size_diff) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
DCHECK(!is_waiting_follow_redirect_call_);
forwarding_client_->OnTransferSizeUpdated(transfer_size_diff);
}
-void CORSURLLoader::OnStartLoadingResponseBody(
+void CorsURLLoader::OnStartLoadingResponseBody(
mojo::ScopedDataPipeConsumerHandle body) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
@@ -333,7 +333,7 @@
forwarding_client_->OnStartLoadingResponseBody(std::move(body));
}
-void CORSURLLoader::OnComplete(const URLLoaderCompletionStatus& status) {
+void CorsURLLoader::OnComplete(const URLLoaderCompletionStatus& status) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
DCHECK(!is_waiting_follow_redirect_call_);
@@ -344,15 +344,15 @@
HandleComplete(modified_status);
}
-void CORSURLLoader::StartRequest() {
- if (fetch_cors_flag_ && !base::ContainsValue(url::GetCORSEnabledSchemes(),
+void CorsURLLoader::StartRequest() {
+ if (fetch_cors_flag_ && !base::ContainsValue(url::GetCorsEnabledSchemes(),
request_.url.scheme())) {
HandleComplete(URLLoaderCompletionStatus(
- CORSErrorStatus(mojom::CORSError::kCORSDisabledScheme)));
+ CorsErrorStatus(mojom::CorsError::kCorsDisabledScheme)));
return;
}
- // If the CORS flag is set, |httpRequest|’s method is neither `GET` nor
+ // If the |CORS flag| is set, |httpRequest|’s method is neither `GET` nor
// `HEAD`, or |httpRequest|’s mode is "websocket", then append
// `Origin`/the result of serializing a request origin with |httpRequest|, to
// |httpRequest|’s header list.
@@ -372,7 +372,7 @@
request_.fetch_request_mode == mojom::FetchRequestMode::kSameOrigin) {
DCHECK(request_.request_initiator);
HandleComplete(URLLoaderCompletionStatus(
- CORSErrorStatus(mojom::CORSError::kDisallowedByMode)));
+ CorsErrorStatus(mojom::CorsError::kDisallowedByMode)));
return;
}
@@ -400,16 +400,16 @@
preflight_finalizer = base::BindOnce(request_finalizer_, request_id_);
preflight_controller_->PerformPreflightCheck(
- base::BindOnce(&CORSURLLoader::StartNetworkRequest,
+ base::BindOnce(&CorsURLLoader::StartNetworkRequest,
weak_factory_.GetWeakPtr()),
request_id_, request_, tainted_,
net::NetworkTrafficAnnotationTag(traffic_annotation_),
network_loader_factory_, std::move(preflight_finalizer));
}
-void CORSURLLoader::StartNetworkRequest(
+void CorsURLLoader::StartNetworkRequest(
int error_code,
- base::Optional<CORSErrorStatus> status,
+ base::Optional<CorsErrorStatus> status,
base::Optional<PreflightTimingInfo> preflight_timing_info) {
if (error_code != net::OK) {
HandleComplete(status ? URLLoaderCompletionStatus(*status)
@@ -426,30 +426,30 @@
// Binding |this| as an unretained pointer is safe because
// |network_client_binding_| shares this object's lifetime.
network_client_binding_.set_connection_error_handler(base::BindOnce(
- &CORSURLLoader::OnConnectionError, base::Unretained(this)));
+ &CorsURLLoader::OnConnectionError, base::Unretained(this)));
network_loader_factory_->CreateLoaderAndStart(
mojo::MakeRequest(&network_loader_), routing_id_, request_id_, options_,
request_, std::move(network_client), traffic_annotation_);
}
-void CORSURLLoader::HandleComplete(const URLLoaderCompletionStatus& status) {
+void CorsURLLoader::HandleComplete(const URLLoaderCompletionStatus& status) {
forwarding_client_->OnComplete(status);
std::move(delete_callback_).Run(this);
// |this| is deleted here.
}
-void CORSURLLoader::OnConnectionError() {
+void CorsURLLoader::OnConnectionError() {
HandleComplete(URLLoaderCompletionStatus(net::ERR_ABORTED));
}
-// This should be identical to CalculateCORSFlag defined in
+// This should be identical to CalculateCorsFlag defined in
// //third_party/blink/renderer/platform/loader/cors/cors.cc.
-void CORSURLLoader::SetCORSFlagIfNeeded() {
+void CorsURLLoader::SetCorsFlagIfNeeded() {
if (fetch_cors_flag_)
return;
if (request_.fetch_request_mode == mojom::FetchRequestMode::kNavigate ||
- request_.fetch_request_mode == mojom::FetchRequestMode::kNoCORS) {
+ request_.fetch_request_mode == mojom::FetchRequestMode::kNoCors) {
return;
}
@@ -490,7 +490,7 @@
fetch_cors_flag_ = true;
}
-base::Optional<std::string> CORSURLLoader::GetHeaderString(
+base::Optional<std::string> CorsURLLoader::GetHeaderString(
const ResourceResponseHead& response,
const std::string& header_name) {
std::string header_value;
diff --git a/services/network/cors/cors_url_loader.h b/services/network/cors/cors_url_loader.h
index fc01b496..0d0c628 100644
--- a/services/network/cors/cors_url_loader.h
+++ b/services/network/cors/cors_url_loader.h
@@ -26,9 +26,9 @@
// Wrapper class that adds cross-origin resource sharing capabilities
// (https://fetch.spec.whatwg.org/#http-cors-protocol), delegating requests as
// well as potential preflight requests to the supplied
-// |network_loader_factory|. It is owned by the CORSURLLoaderFactory that
+// |network_loader_factory|. It is owned by the CorsURLLoaderFactory that
// created it.
-class COMPONENT_EXPORT(NETWORK_SERVICE) CORSURLLoader
+class COMPONENT_EXPORT(NETWORK_SERVICE) CorsURLLoader
: public mojom::URLLoader,
public mojom::URLLoaderClient {
public:
@@ -37,7 +37,7 @@
// Assumes network_loader_factory outlives this loader.
// TODO(yhirano): Remove |request_finalizer| when the network service is
// fully enabled.
- CORSURLLoader(
+ CorsURLLoader(
mojom::URLLoaderRequest loader_request,
int32_t routing_id,
int32_t request_id,
@@ -51,7 +51,7 @@
const OriginAccessList* origin_access_list,
PreflightController* preflight_controller);
- ~CORSURLLoader() override;
+ ~CorsURLLoader() override;
// Starts processing the request. This is expected to be called right after
// the constructor.
@@ -85,7 +85,7 @@
void StartRequest();
void StartNetworkRequest(
int net_error,
- base::Optional<CORSErrorStatus> status,
+ base::Optional<CorsErrorStatus> status,
base::Optional<PreflightTimingInfo> preflight_timing_info);
// Called when there is a connection error on the upstream pipe used for the
@@ -97,7 +97,7 @@
void OnConnectionError();
- void SetCORSFlagIfNeeded();
+ void SetCorsFlagIfNeeded();
static base::Optional<std::string> GetHeaderString(
const ResourceResponseHead& response,
@@ -112,7 +112,7 @@
DeleteCallback delete_callback_;
- // This raw URLLoaderFactory pointer is shared with the CORSURLLoaderFactory
+ // This raw URLLoaderFactory pointer is shared with the CorsURLLoaderFactory
// that created and owns this object.
mojom::URLLoaderFactory* network_loader_factory_;
@@ -164,9 +164,9 @@
PreflightController* preflight_controller_;
// Used to run asynchronous class instance bound callbacks safely.
- base::WeakPtrFactory<CORSURLLoader> weak_factory_;
+ base::WeakPtrFactory<CorsURLLoader> weak_factory_;
- DISALLOW_COPY_AND_ASSIGN(CORSURLLoader);
+ DISALLOW_COPY_AND_ASSIGN(CorsURLLoader);
};
} // namespace cors
diff --git a/services/network/cors/cors_url_loader_factory.cc b/services/network/cors/cors_url_loader_factory.cc
index 570b69b0..f1d341b6 100644
--- a/services/network/cors/cors_url_loader_factory.cc
+++ b/services/network/cors/cors_url_loader_factory.cc
@@ -19,7 +19,7 @@
namespace cors {
-CORSURLLoaderFactory::CORSURLLoaderFactory(
+CorsURLLoaderFactory::CorsURLLoaderFactory(
NetworkContext* context,
mojom::URLLoaderFactoryParamsPtr params,
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
@@ -37,11 +37,11 @@
DCHECK(origin_access_list_);
bindings_.AddBinding(this, std::move(request));
bindings_.set_connection_error_handler(base::BindRepeating(
- &CORSURLLoaderFactory::DeleteIfNeeded, base::Unretained(this)));
+ &CorsURLLoaderFactory::DeleteIfNeeded, base::Unretained(this)));
preflight_controller_ = context_->cors_preflight_controller();
}
-CORSURLLoaderFactory::CORSURLLoaderFactory(
+CorsURLLoaderFactory::CorsURLLoaderFactory(
bool disable_web_security,
std::unique_ptr<mojom::URLLoaderFactory> network_loader_factory,
const base::RepeatingCallback<void(int)>& preflight_finalizer,
@@ -57,14 +57,14 @@
preflight_controller_ = owned_preflight_controller_.get();
}
-CORSURLLoaderFactory::~CORSURLLoaderFactory() = default;
+CorsURLLoaderFactory::~CorsURLLoaderFactory() = default;
-void CORSURLLoaderFactory::OnLoaderCreated(
+void CorsURLLoaderFactory::OnLoaderCreated(
std::unique_ptr<mojom::URLLoader> loader) {
loaders_.insert(std::move(loader));
}
-void CORSURLLoaderFactory::DestroyURLLoader(mojom::URLLoader* loader) {
+void CorsURLLoaderFactory::DestroyURLLoader(mojom::URLLoader* loader) {
auto it = loaders_.find(loader);
DCHECK(it != loaders_.end());
loaders_.erase(it);
@@ -72,7 +72,7 @@
DeleteIfNeeded();
}
-void CORSURLLoaderFactory::CreateLoaderAndStart(
+void CorsURLLoaderFactory::CreateLoaderAndStart(
mojom::URLLoaderRequest request,
int32_t routing_id,
int32_t request_id,
@@ -85,11 +85,11 @@
return;
}
- if (base::FeatureList::IsEnabled(features::kOutOfBlinkCORS) &&
+ if (base::FeatureList::IsEnabled(features::kOutOfBlinkCors) &&
!disable_web_security_) {
- auto loader = std::make_unique<CORSURLLoader>(
+ auto loader = std::make_unique<CorsURLLoader>(
std::move(request), routing_id, request_id, options,
- base::BindOnce(&CORSURLLoaderFactory::DestroyURLLoader,
+ base::BindOnce(&CorsURLLoaderFactory::DestroyURLLoader,
base::Unretained(this)),
resource_request, std::move(client), traffic_annotation,
network_loader_factory_.get(), preflight_finalizer_,
@@ -104,28 +104,28 @@
}
}
-void CORSURLLoaderFactory::Clone(mojom::URLLoaderFactoryRequest request) {
+void CorsURLLoaderFactory::Clone(mojom::URLLoaderFactoryRequest request) {
// The cloned factories stop working when this factory is destructed.
bindings_.AddBinding(this, std::move(request));
}
-void CORSURLLoaderFactory::ClearBindings() {
+void CorsURLLoaderFactory::ClearBindings() {
bindings_.CloseAllBindings();
}
-void CORSURLLoaderFactory::DeleteIfNeeded() {
+void CorsURLLoaderFactory::DeleteIfNeeded() {
if (!context_)
return;
if (bindings_.empty() && loaders_.empty())
context_->DestroyURLLoaderFactory(this);
}
-bool CORSURLLoaderFactory::IsSane(const ResourceRequest& request) {
+bool CorsURLLoaderFactory::IsSane(const ResourceRequest& request) {
// CORS needs a proper origin (including a unique opaque origin). If the
// request doesn't have one, CORS cannot work.
if (!request.request_initiator &&
request.fetch_request_mode != mojom::FetchRequestMode::kNavigate &&
- request.fetch_request_mode != mojom::FetchRequestMode::kNoCORS) {
+ request.fetch_request_mode != mojom::FetchRequestMode::kNoCors) {
LOG(WARNING) << "|fetch_request_mode| is " << request.fetch_request_mode
<< ", but |request_initiator| is not set.";
return false;
diff --git a/services/network/cors/cors_url_loader_factory.h b/services/network/cors/cors_url_loader_factory.h
index 55ee955..a83cd01 100644
--- a/services/network/cors/cors_url_loader_factory.h
+++ b/services/network/cors/cors_url_loader_factory.h
@@ -28,14 +28,14 @@
// A factory class to create a URLLoader that supports CORS.
// This class takes a network::mojom::URLLoaderFactory instance in the
-// constructor and owns it to make network requests for CORS preflight, and
+// constructor and owns it to make network requests for CORS-preflight, and
// actual network request.
-class COMPONENT_EXPORT(NETWORK_SERVICE) CORSURLLoaderFactory final
+class COMPONENT_EXPORT(NETWORK_SERVICE) CorsURLLoaderFactory final
: public mojom::URLLoaderFactory {
public:
// |origin_access_list| should always outlive this factory instance.
// Used by network::NetworkContext.
- CORSURLLoaderFactory(
+ CorsURLLoaderFactory(
NetworkContext* context,
mojom::URLLoaderFactoryParamsPtr params,
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
@@ -43,12 +43,12 @@
const OriginAccessList* origin_access_list);
// Used by content::ResourceMessageFilter.
// TODO(yhirano): Remove this once when the network service is fully enabled.
- CORSURLLoaderFactory(
+ CorsURLLoaderFactory(
bool disable_web_security,
std::unique_ptr<mojom::URLLoaderFactory> network_loader_factory,
const base::RepeatingCallback<void(int)>& preflight_finalizer,
const OriginAccessList* origin_access_list);
- ~CORSURLLoaderFactory() override;
+ ~CorsURLLoaderFactory() override;
void OnLoaderCreated(std::unique_ptr<mojom::URLLoader> loader);
void DestroyURLLoader(mojom::URLLoader* loader);
@@ -99,7 +99,7 @@
PreflightController* preflight_controller_;
std::unique_ptr<PreflightController> owned_preflight_controller_;
- DISALLOW_COPY_AND_ASSIGN(CORSURLLoaderFactory);
+ DISALLOW_COPY_AND_ASSIGN(CorsURLLoaderFactory);
};
} // namespace cors
diff --git a/services/network/cors/cors_url_loader_unittest.cc b/services/network/cors/cors_url_loader_unittest.cc
index 5ed21810..9a142cb 100644
--- a/services/network/cors/cors_url_loader_unittest.cc
+++ b/services/network/cors/cors_url_loader_unittest.cc
@@ -114,15 +114,15 @@
DISALLOW_COPY_AND_ASSIGN(TestURLLoaderFactory);
};
-class CORSURLLoaderTest : public testing::Test {
+class CorsURLLoaderTest : public testing::Test {
public:
using ReferrerPolicy = net::URLRequest::ReferrerPolicy;
- CORSURLLoaderTest() {
+ CorsURLLoaderTest() {
std::unique_ptr<TestURLLoaderFactory> factory =
std::make_unique<TestURLLoaderFactory>();
test_url_loader_factory_ = factory->GetWeakPtr();
- cors_url_loader_factory_ = std::make_unique<CORSURLLoaderFactory>(
+ cors_url_loader_factory_ = std::make_unique<CorsURLLoaderFactory>(
false, std::move(factory), base::RepeatingCallback<void(int)>(),
&origin_access_list_);
}
@@ -130,7 +130,7 @@
protected:
// testing::Test implementation.
void SetUp() override {
- feature_list_.InitAndEnableFeature(features::kOutOfBlinkCORS);
+ feature_list_.InitAndEnableFeature(features::kOutOfBlinkCors);
}
void CreateLoaderAndStart(const GURL& origin,
@@ -233,7 +233,7 @@
source_origin,
network::mojom::CorsOriginPattern::New(
protocol, domain, allow_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
}
static net::RedirectInfo CreateRedirectInfo(
@@ -255,13 +255,13 @@
// Be the first member so it is destroyed last.
base::MessageLoop message_loop_;
- // Testing instance to enable kOutOfBlinkCORS feature.
+ // Testing instance to enable kOutOfBlinkCors feature.
base::test::ScopedFeatureList feature_list_;
- // CORSURLLoaderFactory instance under tests.
+ // CorsURLLoaderFactory instance under tests.
std::unique_ptr<mojom::URLLoaderFactory> cors_url_loader_factory_;
- // TestURLLoaderFactory instance owned by CORSURLLoaderFactory.
+ // TestURLLoaderFactory instance owned by CorsURLLoaderFactory.
base::WeakPtr<TestURLLoaderFactory> test_url_loader_factory_;
// Holds URLLoaderPtr that CreateLoaderAndStart() creates.
@@ -273,10 +273,10 @@
// Holds for allowed origin access lists.
OriginAccessList origin_access_list_;
- DISALLOW_COPY_AND_ASSIGN(CORSURLLoaderTest);
+ DISALLOW_COPY_AND_ASSIGN(CorsURLLoaderTest);
};
-TEST_F(CORSURLLoaderTest, SameOriginWithoutInitiator) {
+TEST_F(CorsURLLoaderTest, SameOriginWithoutInitiator) {
ResourceRequest request;
request.fetch_request_mode = mojom::FetchRequestMode::kSameOrigin;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
@@ -293,9 +293,9 @@
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, NoCORSWithoutInitiator) {
+TEST_F(CorsURLLoaderTest, NoCorsWithoutInitiator) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kNoCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kNoCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
request.url = GURL("http://example.com/");
request.request_initiator = base::nullopt;
@@ -312,9 +312,9 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CORSWithoutInitiator) {
+TEST_F(CorsURLLoaderTest, CorsWithoutInitiator) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
request.url = GURL("http://example.com/");
request.request_initiator = base::nullopt;
@@ -329,7 +329,7 @@
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, NavigateWithoutInitiator) {
+TEST_F(CorsURLLoaderTest, NavigateWithoutInitiator) {
ResourceRequest request;
request.fetch_request_mode = mojom::FetchRequestMode::kNavigate;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
@@ -348,7 +348,7 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther1) {
+TEST_F(CorsURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther1) {
ResourceRequest request;
request.fetch_request_mode = mojom::FetchRequestMode::kNavigate;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
@@ -367,7 +367,7 @@
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther2) {
+TEST_F(CorsURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther2) {
ResourceRequest request;
request.fetch_request_mode = mojom::FetchRequestMode::kNavigate;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
@@ -386,7 +386,7 @@
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther3) {
+TEST_F(CorsURLLoaderTest, CredentialsModeAndLoadFlagsContradictEachOther3) {
ResourceRequest request;
request.fetch_request_mode = mojom::FetchRequestMode::kNavigate;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
@@ -405,7 +405,7 @@
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, SameOriginRequest) {
+TEST_F(CorsURLLoaderTest, SameOriginRequest) {
const GURL url("http://example.com/foo.png");
CreateLoaderAndStart(url.GetOrigin(), url,
mojom::FetchRequestMode::kSameOrigin);
@@ -422,10 +422,10 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CrossOriginRequestWithNoCORSMode) {
+TEST_F(CorsURLLoaderTest, CrossOriginRequestWithNoCorsMode) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kNoCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kNoCors);
NotifyLoaderClientOnReceiveResponse();
NotifyLoaderClientOnComplete(net::OK);
@@ -441,11 +441,11 @@
GetRequest().headers.HasHeader(net::HttpRequestHeaders::kOrigin));
}
-TEST_F(CORSURLLoaderTest, CrossOriginRequestWithNoCORSModeAndPatchMethod) {
+TEST_F(CorsURLLoaderTest, CrossOriginRequestWithNoCorsModeAndPatchMethod) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kNoCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kNoCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
request.method = "PATCH";
request.url = url;
@@ -468,7 +468,7 @@
EXPECT_EQ(origin_header, "http://example.com");
}
-TEST_F(CORSURLLoaderTest, CrossOriginRequestFetchRequestModeSameOrigin) {
+TEST_F(CorsURLLoaderTest, CrossOriginRequestFetchRequestModeSameOrigin) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kSameOrigin);
@@ -482,14 +482,14 @@
EXPECT_FALSE(client().has_received_response());
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
ASSERT_TRUE(client().completion_status().cors_error_status);
- EXPECT_EQ(mojom::CORSError::kDisallowedByMode,
+ EXPECT_EQ(mojom::CorsError::kDisallowedByMode,
client().completion_status().cors_error_status->cors_error);
}
-TEST_F(CORSURLLoaderTest, CrossOriginRequestWithCORSModeButMissingCORSHeader) {
+TEST_F(CorsURLLoaderTest, CrossOriginRequestWithCorsModeButMissingCorsHeader) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
NotifyLoaderClientOnReceiveResponse();
NotifyLoaderClientOnComplete(net::OK);
@@ -505,14 +505,14 @@
EXPECT_FALSE(client().has_received_response());
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
ASSERT_TRUE(client().completion_status().cors_error_status);
- EXPECT_EQ(mojom::CORSError::kMissingAllowOriginHeader,
+ EXPECT_EQ(mojom::CorsError::kMissingAllowOriginHeader,
client().completion_status().cors_error_status->cors_error);
}
-TEST_F(CORSURLLoaderTest, CrossOriginRequestWithCORSMode) {
+TEST_F(CorsURLLoaderTest, CrossOriginRequestWithCorsMode) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
NotifyLoaderClientOnReceiveResponse(
{"Access-Control-Allow-Origin: http://example.com"});
@@ -527,11 +527,11 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest,
- CrossOriginRequestFetchRequestWithCORSModeButMismatchedCORSHeader) {
+TEST_F(CorsURLLoaderTest,
+ CrossOriginRequestFetchRequestWithCorsModeButMismatchedCorsHeader) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
NotifyLoaderClientOnReceiveResponse(
{"Access-Control-Allow-Origin: http://some-other-domain.com"});
@@ -544,15 +544,15 @@
EXPECT_FALSE(client().has_received_response());
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
ASSERT_TRUE(client().completion_status().cors_error_status);
- EXPECT_EQ(mojom::CORSError::kAllowOriginMismatch,
+ EXPECT_EQ(mojom::CorsError::kAllowOriginMismatch,
client().completion_status().cors_error_status->cors_error);
}
-TEST_F(CORSURLLoaderTest, StripUsernameAndPassword) {
+TEST_F(CorsURLLoaderTest, StripUsernameAndPassword) {
const GURL origin("http://example.com");
const GURL url("http://foo:[email protected]/foo.png");
std::string stripped_url = "http://other.com/foo.png";
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
NotifyLoaderClientOnReceiveResponse(
{"Access-Control-Allow-Origin: http://example.com"});
@@ -568,12 +568,12 @@
EXPECT_EQ(stripped_url, GetRequestedURL().spec());
}
-TEST_F(CORSURLLoaderTest, CORSCheckPassOnRedirect) {
+TEST_F(CorsURLLoaderTest, CorsCheckPassOnRedirect) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -590,12 +590,12 @@
EXPECT_TRUE(client().has_received_redirect());
}
-TEST_F(CORSURLLoaderTest, CORSCheckFailOnRedirect) {
+TEST_F(CorsURLLoaderTest, CorsCheckFailOnRedirect) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -611,15 +611,15 @@
EXPECT_EQ(client().completion_status().error_code, net::ERR_FAILED);
ASSERT_TRUE(client().completion_status().cors_error_status);
EXPECT_EQ(client().completion_status().cors_error_status->cors_error,
- mojom::CORSError::kMissingAllowOriginHeader);
+ mojom::CorsError::kMissingAllowOriginHeader);
}
-TEST_F(CORSURLLoaderTest, SameOriginToSameOriginRedirect) {
+TEST_F(CorsURLLoaderTest, SameOriginToSameOriginRedirect) {
const GURL origin("https://example.com");
const GURL url("https://example.com/foo.png");
const GURL new_url("https://example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -650,12 +650,12 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, SameOriginToCrossOriginRedirect) {
+TEST_F(CorsURLLoaderTest, SameOriginToCrossOriginRedirect) {
const GURL origin("https://example.com");
const GURL url("https://example.com/foo.png");
const GURL new_url("https://other.example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -689,12 +689,12 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CrossOriginToCrossOriginRedirect) {
+TEST_F(CorsURLLoaderTest, CrossOriginToCrossOriginRedirect) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other.example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -729,12 +729,12 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, CrossOriginToOriginalOriginRedirect) {
+TEST_F(CorsURLLoaderTest, CrossOriginToOriginalOriginRedirect) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -770,15 +770,15 @@
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
ASSERT_TRUE(client().completion_status().cors_error_status);
EXPECT_EQ(client().completion_status().cors_error_status->cors_error,
- mojom::CORSError::kMissingAllowOriginHeader);
+ mojom::CorsError::kMissingAllowOriginHeader);
}
-TEST_F(CORSURLLoaderTest, CrossOriginToAnotherCrossOriginRedirect) {
+TEST_F(CorsURLLoaderTest, CrossOriginToAnotherCrossOriginRedirect) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
EXPECT_EQ(1, num_created_loaders());
EXPECT_EQ(GetRequest().url, url);
@@ -813,14 +813,14 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest,
+TEST_F(CorsURLLoaderTest,
CrossOriginToAnotherCrossOriginRedirectWithPreflight) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
ResourceRequest original_request;
- original_request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ original_request.fetch_request_mode = mojom::FetchRequestMode::kCors;
original_request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
original_request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
original_request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -887,13 +887,13 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, RedirectInfoShouldBeUsed) {
+TEST_F(CorsURLLoaderTest, RedirectInfoShouldBeUsed) {
const GURL origin("https://example.com");
const GURL url("https://example.com/foo.png");
const GURL new_url("https://other.example.com/foo.png");
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -941,11 +941,11 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, TooManyRedirects) {
+TEST_F(CorsURLLoaderTest, TooManyRedirects) {
const GURL origin("https://example.com");
const GURL url("https://example.com/foo.png");
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
for (int i = 0; i < 20; ++i) {
EXPECT_EQ(1, num_created_loaders());
@@ -972,13 +972,13 @@
client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, FollowErrorRedirect) {
+TEST_F(CorsURLLoaderTest, FollowErrorRedirect) {
const GURL origin("https://example.com");
const GURL url("https://example.com/foo.png");
const GURL new_url("https://example.com/bar.png");
ResourceRequest original_request;
- original_request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ original_request.fetch_request_mode = mojom::FetchRequestMode::kCors;
original_request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
original_request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
original_request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -1008,7 +1008,7 @@
// Tests if OriginAccessList is actually used to decide the cors flag.
// Does not verify detailed functionalities that are verified in
// OriginAccessListTest.
-TEST_F(CORSURLLoaderTest, OriginAccessList) {
+TEST_F(CorsURLLoaderTest, OriginAccessList) {
const GURL origin("http://example.com");
const GURL url("http://other.com/foo.png");
@@ -1017,7 +1017,7 @@
AddAllowListEntryForOrigin(url::Origin::Create(origin), url.scheme(),
url.host(), false);
- CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCORS);
+ CreateLoaderAndStart(origin, url, mojom::FetchRequestMode::kCors);
NotifyLoaderClientOnReceiveResponse();
NotifyLoaderClientOnComplete(net::OK);
@@ -1031,13 +1031,13 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, 304ForSimpleRevalidation) {
+TEST_F(CorsURLLoaderTest, 304ForSimpleRevalidation) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -1063,13 +1063,13 @@
EXPECT_EQ(net::OK, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, 304ForSimpleGet) {
+TEST_F(CorsURLLoaderTest, 304ForSimpleGet) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -1091,13 +1091,13 @@
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, 200ForSimpleRevalidation) {
+TEST_F(CorsURLLoaderTest, 200ForSimpleRevalidation) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
@@ -1123,13 +1123,13 @@
EXPECT_EQ(net::ERR_FAILED, client().completion_status().error_code);
}
-TEST_F(CORSURLLoaderTest, RevalidationAndPreflight) {
+TEST_F(CorsURLLoaderTest, RevalidationAndPreflight) {
const GURL origin("https://example.com");
const GURL url("https://other.example.com/foo.png");
const GURL new_url("https://other2.example.com/bar.png");
ResourceRequest original_request;
- original_request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ original_request.fetch_request_mode = mojom::FetchRequestMode::kCors;
original_request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
original_request.load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
original_request.load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
index 09b8403..de1fcf6 100644
--- a/services/network/cors/preflight_controller.cc
+++ b/services/network/cors/preflight_controller.cc
@@ -48,7 +48,7 @@
// agent. They must be checked separately and rejected for
// JavaScript-initiated requests.
std::vector<std::string> filtered_headers =
- CORSUnsafeNotForbiddenRequestHeaderNames(headers.GetHeaderVector(),
+ CorsUnsafeNotForbiddenRequestHeaderNames(headers.GetHeaderVector(),
is_revalidating);
if (filtered_headers.empty())
return std::string();
@@ -121,7 +121,7 @@
const ResourceResponseHead& head,
const ResourceRequest& original_request,
bool tainted,
- base::Optional<CORSErrorStatus>* detected_error_status) {
+ base::Optional<CorsErrorStatus>* detected_error_status) {
DCHECK(detected_error_status);
*detected_error_status = CheckPreflightAccess(
@@ -134,10 +134,10 @@
if (*detected_error_status)
return nullptr;
- base::Optional<mojom::CORSError> error;
+ base::Optional<mojom::CorsError> error;
error = CheckPreflight(head.headers->response_code());
if (error) {
- *detected_error_status = CORSErrorStatus(*error);
+ *detected_error_status = CorsErrorStatus(*error);
return nullptr;
}
@@ -156,14 +156,14 @@
&error);
if (error)
- *detected_error_status = CORSErrorStatus(*error);
+ *detected_error_status = CorsErrorStatus(*error);
return result;
}
-base::Optional<CORSErrorStatus> CheckPreflightResult(
+base::Optional<CorsErrorStatus> CheckPreflightResult(
PreflightResult* result,
const ResourceRequest& original_request) {
- base::Optional<CORSErrorStatus> status =
+ base::Optional<CorsErrorStatus> status =
result->EnsureAllowedCrossOriginMethod(original_request.method);
if (status)
return status;
@@ -272,7 +272,7 @@
std::move(completion_callback_)
.Run(net::ERR_FAILED,
- CORSErrorStatus(mojom::CORSError::kPreflightDisallowedRedirect),
+ CorsErrorStatus(mojom::CorsError::kPreflightDisallowedRedirect),
base::nullopt);
RemoveFromController();
@@ -291,7 +291,7 @@
&timing_info_.timing_allow_origin);
timing_info_.transfer_size = head.encoded_data_length;
- base::Optional<CORSErrorStatus> detected_error_status;
+ base::Optional<CorsErrorStatus> detected_error_status;
std::unique_ptr<PreflightResult> result = CreatePreflightResult(
final_url, head, original_request_, tainted_, &detected_error_status);
diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
index 4344df3..defe11b 100644
--- a/services/network/cors/preflight_controller.h
+++ b/services/network/cors/preflight_controller.h
@@ -36,7 +36,7 @@
// PreflightTimingInfo is provided only when a preflight request was made.
using CompletionCallback =
base::OnceCallback<void(int net_error,
- base::Optional<CORSErrorStatus>,
+ base::Optional<CorsErrorStatus>,
base::Optional<PreflightTimingInfo>)>;
// Creates a CORS-preflight ResourceRequest for a specified |request| for a
// URL that is originally requested.
diff --git a/services/network/cors/preflight_controller_unittest.cc b/services/network/cors/preflight_controller_unittest.cc
index a300222..f30e825 100644
--- a/services/network/cors/preflight_controller_unittest.cc
+++ b/services/network/cors/preflight_controller_unittest.cc
@@ -32,7 +32,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, LexicographicalOrder) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader("Orange", "Orange");
@@ -57,7 +57,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, ExcludeSimpleHeaders) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader("Accept", "everything");
@@ -79,7 +79,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, Credentials) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kInclude;
request.request_initiator = url::Origin();
request.headers.SetHeader("Orange", "Orange");
@@ -97,7 +97,7 @@
TEST(PreflightControllerCreatePreflightRequestTest,
ExcludeSimpleContentTypeHeader) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader(net::HttpRequestHeaders::kContentType,
@@ -114,7 +114,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, IncludeNonSimpleHeader) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader("X-Custom-Header", "foobar");
@@ -131,7 +131,7 @@
TEST(PreflightControllerCreatePreflightRequestTest,
IncludeNonSimpleContentTypeHeader) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader(net::HttpRequestHeaders::kContentType,
@@ -148,7 +148,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, ExcludeForbiddenHeaders) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin();
request.headers.SetHeader("referer", "https://www.google.com/");
@@ -163,7 +163,7 @@
TEST(PreflightControllerCreatePreflightRequestTest, Tainted) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.request_initiator = url::Origin::Create(GURL("https://example.com"));
@@ -202,7 +202,7 @@
protected:
void HandleRequestCompletion(
int net_error,
- base::Optional<CORSErrorStatus> status,
+ base::Optional<CorsErrorStatus> status,
base::Optional<PreflightTimingInfo> timing_info) {
net_error_ = net_error;
status_ = status;
@@ -226,8 +226,8 @@
}
int net_error() const { return net_error_; }
- base::Optional<CORSErrorStatus> status() { return status_; }
- base::Optional<CORSErrorStatus> success() { return base::nullopt; }
+ base::Optional<CorsErrorStatus> status() { return status_; }
+ base::Optional<CorsErrorStatus> success() { return base::nullopt; }
size_t access_count() { return access_count_; }
bool cancel_preflight_called() const { return cancel_preflight_called_; }
@@ -286,12 +286,12 @@
std::unique_ptr<PreflightController> preflight_controller_;
int net_error_ = net::OK;
- base::Optional<CORSErrorStatus> status_;
+ base::Optional<CorsErrorStatus> status_;
};
TEST_F(PreflightControllerTest, CheckInvalidRequest) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.url = GetURL("/404");
request.request_initiator = url::Origin::Create(request.url);
@@ -299,13 +299,13 @@
PerformPreflightCheck(request);
EXPECT_EQ(net::ERR_FAILED, net_error());
ASSERT_TRUE(status());
- EXPECT_EQ(mojom::CORSError::kPreflightInvalidStatus, status()->cors_error);
+ EXPECT_EQ(mojom::CorsError::kPreflightInvalidStatus, status()->cors_error);
EXPECT_EQ(1u, access_count());
}
TEST_F(PreflightControllerTest, CheckValidRequest) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.url = GetURL("/allow");
request.request_initiator = url::Origin::Create(request.url);
@@ -323,7 +323,7 @@
TEST_F(PreflightControllerTest, CheckTaintedRequest) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.url = GetURL("/tainted");
request.request_initiator = url::Origin::Create(request.url);
@@ -338,7 +338,7 @@
// enabled.
TEST_F(PreflightControllerTest, CancelPreflightIsCalled) {
ResourceRequest request;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.fetch_credentials_mode = mojom::FetchCredentialsMode::kOmit;
request.url = GetURL("/allow");
request.request_initiator = url::Origin::Create(request.url);
diff --git a/services/network/cross_origin_read_blocking.cc b/services/network/cross_origin_read_blocking.cc
index 02b7e5f6..b508cf94 100644
--- a/services/network/cross_origin_read_blocking.cc
+++ b/services/network/cross_origin_read_blocking.cc
@@ -609,7 +609,7 @@
if (response.head.was_fetched_via_service_worker) {
switch (response.head.response_type) {
case network::mojom::FetchResponseType::kBasic:
- case network::mojom::FetchResponseType::kCORS:
+ case network::mojom::FetchResponseType::kCors:
case network::mojom::FetchResponseType::kDefault:
case network::mojom::FetchResponseType::kError:
// Non-opaque responses shouldn't be blocked.
diff --git a/services/network/cross_origin_read_blocking.h b/services/network/cross_origin_read_blocking.h
index 6344eca..6378978 100644
--- a/services/network/cross_origin_read_blocking.h
+++ b/services/network/cross_origin_read_blocking.h
@@ -234,7 +234,7 @@
// not allowed by actual CORS rules by ignoring 1) credentials and 2)
// methods. Preflight requests don't matter here since they are not used to
// decide whether to block a response or not on the client side.
- // TODO(crbug.com/736308) Remove this check once the kOutOfBlinkCORS feature
+ // TODO(crbug.com/736308) Remove this check once the kOutOfBlinkCors feature
// is shipped.
static bool IsValidCorsHeaderSet(const url::Origin& frame_origin,
const std::string& access_control_origin);
diff --git a/services/network/expect_ct_reporter.h b/services/network/expect_ct_reporter.h
index e8220a3..b7f1b60f 100644
--- a/services/network/expect_ct_reporter.h
+++ b/services/network/expect_ct_reporter.h
@@ -76,11 +76,11 @@
FRIEND_TEST_ALL_PREFIXES(ExpectCTReporterTest, SendReport);
FRIEND_TEST_ALL_PREFIXES(ExpectCTReporterTest, PreflightContainsWhitespace);
FRIEND_TEST_ALL_PREFIXES(ExpectCTReporterTest,
- BadCORSPreflightResponseOrigin);
+ BadCorsPreflightResponseOrigin);
FRIEND_TEST_ALL_PREFIXES(ExpectCTReporterTest,
- BadCORSPreflightResponseMethods);
+ BadCorsPreflightResponseMethods);
FRIEND_TEST_ALL_PREFIXES(ExpectCTReporterTest,
- BadCORSPreflightResponseHeaders);
+ BadCorsPreflightResponseHeaders);
// Starts a CORS preflight request to obtain permission from the server to
// send a report with Content-Type: application/expect-ct-report+json. The
diff --git a/services/network/expect_ct_reporter_unittest.cc b/services/network/expect_ct_reporter_unittest.cc
index 191dc5e..e10264a 100644
--- a/services/network/expect_ct_reporter_unittest.cc
+++ b/services/network/expect_ct_reporter_unittest.cc
@@ -407,7 +407,7 @@
EXPECT_EQ(successful_report_uri, sender->latest_report_uri());
}
- void SetCORSHeaderWithWhitespace() {
+ void SetCorsHeaderWithWhitespace() {
cors_headers_["Access-Control-Allow-Methods"] = "GET, POST";
}
@@ -688,7 +688,7 @@
// Test that report preflight responses can contain whitespace.
TEST_F(ExpectCTReporterTest, PreflightContainsWhitespace) {
- SetCORSHeaderWithWhitespace();
+ SetCorsHeaderWithWhitespace();
TestCertificateReportSender* sender = new TestCertificateReportSender();
net::TestURLRequestContext context;
@@ -719,7 +719,7 @@
// Test that no report is sent when the CORS preflight returns an invalid
// Access-Control-Allow-Origin.
-TEST_F(ExpectCTReporterTest, BadCORSPreflightResponseOrigin) {
+TEST_F(ExpectCTReporterTest, BadCorsPreflightResponseOrigin) {
TestCertificateReportSender* sender = new TestCertificateReportSender();
net::TestURLRequestContext context;
ExpectCTReporter reporter(&context, base::Closure(), base::Closure());
@@ -743,7 +743,7 @@
// Test that no report is sent when the CORS preflight returns an invalid
// Access-Control-Allow-Methods.
-TEST_F(ExpectCTReporterTest, BadCORSPreflightResponseMethods) {
+TEST_F(ExpectCTReporterTest, BadCorsPreflightResponseMethods) {
TestCertificateReportSender* sender = new TestCertificateReportSender();
net::TestURLRequestContext context;
ExpectCTReporter reporter(&context, base::Closure(), base::Closure());
@@ -767,7 +767,7 @@
// Test that no report is sent when the CORS preflight returns an invalid
// Access-Control-Allow-Headers.
-TEST_F(ExpectCTReporterTest, BadCORSPreflightResponseHeaders) {
+TEST_F(ExpectCTReporterTest, BadCorsPreflightResponseHeaders) {
TestCertificateReportSender* sender = new TestCertificateReportSender();
net::TestURLRequestContext context;
ExpectCTReporter reporter(&context, base::Closure(), base::Closure());
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 52ca693e8..172a125 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -633,7 +633,7 @@
mojom::URLLoaderFactoryRequest request,
mojom::URLLoaderFactoryParamsPtr params,
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client) {
- url_loader_factories_.emplace(std::make_unique<cors::CORSURLLoaderFactory>(
+ url_loader_factories_.emplace(std::make_unique<cors::CorsURLLoaderFactory>(
this, std::move(params), std::move(resource_scheduler_client),
std::move(request), &cors_origin_access_list_));
}
@@ -683,7 +683,7 @@
}
void NetworkContext::DestroyURLLoaderFactory(
- cors::CORSURLLoaderFactory* url_loader_factory) {
+ cors::CorsURLLoaderFactory* url_loader_factory) {
auto it = url_loader_factories_.find(url_loader_factory);
DCHECK(it != url_loader_factories_.end());
url_loader_factories_.erase(it);
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 25a997c..23bf2c7 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -80,7 +80,7 @@
class WebSocketFactory;
namespace cors {
-class CORSURLLoaderFactory;
+class CorsURLLoaderFactory;
} // namespace cors
// A NetworkContext creates and manages access to a URLRequestContext.
@@ -321,7 +321,7 @@
// Destroys the specified factory. Called by the factory itself when it has
// no open pipes.
- void DestroyURLLoaderFactory(cors::CORSURLLoaderFactory* url_loader_factory);
+ void DestroyURLLoaderFactory(cors::CorsURLLoaderFactory* url_loader_factory);
size_t GetNumOutstandingResolveHostRequestsForTesting() const;
@@ -441,7 +441,7 @@
// This must be below |url_request_context_| so that the URLRequestContext
// outlives all the URLLoaderFactories and URLLoaders that depend on it.
- std::set<std::unique_ptr<cors::CORSURLLoaderFactory>,
+ std::set<std::unique_ptr<cors::CorsURLLoaderFactory>,
base::UniquePtrComparator>
url_loader_factories_;
diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc
index 2a53bec..17ed91da 100644
--- a/services/network/public/cpp/cors/cors.cc
+++ b/services/network/public/cpp/cors/cors.cc
@@ -103,7 +103,7 @@
}
// |value| should be lower case.
-bool IsCORSSafelistedLowerCaseContentType(const std::string& value) {
+bool IsCorsSafelistedLowerCaseContentType(const std::string& value) {
DCHECK_EQ(value, base::ToLowerASCII(value));
if (std::any_of(value.begin(), value.end(), IsCorsUnsafeRequestHeaderByte))
return false;
@@ -135,7 +135,7 @@
} // namespace header_names
// See https://fetch.spec.whatwg.org/#cors-check.
-base::Optional<CORSErrorStatus> CheckAccess(
+base::Optional<CorsErrorStatus> CheckAccess(
const GURL& response_url,
const int response_status_code,
const base::Optional<std::string>& allow_origin_header,
@@ -145,7 +145,7 @@
// TODO(toyoshim): This response status code check should not be needed. We
// have another status code check after a CheckAccess() call if it is needed.
if (!response_status_code)
- return CORSErrorStatus(mojom::CORSError::kInvalidResponse);
+ return CorsErrorStatus(mojom::CorsError::kInvalidResponse);
if (allow_origin_header == kAsterisk) {
// A wildcard Access-Control-Allow-Origin can not be used if credentials are
@@ -161,9 +161,9 @@
// browser process or network service, this check won't be needed any more
// because it is always for network requests there.
if (response_url.SchemeIsHTTPOrHTTPS())
- return CORSErrorStatus(mojom::CORSError::kWildcardOriginNotAllowed);
+ return CorsErrorStatus(mojom::CorsError::kWildcardOriginNotAllowed);
} else if (!allow_origin_header) {
- return CORSErrorStatus(mojom::CORSError::kMissingAllowOriginHeader);
+ return CorsErrorStatus(mojom::CorsError::kMissingAllowOriginHeader);
} else if (*allow_origin_header != origin.Serialize()) {
// We do not use url::Origin::IsSameOriginWith() here for two reasons below.
// 1. Allow "null" to match here. The latest spec does not have a clear
@@ -182,13 +182,13 @@
// Does not allow to have multiple origins in the allow origin header.
// See https://fetch.spec.whatwg.org/#http-access-control-allow-origin.
if (allow_origin_header->find_first_of(" ,") != std::string::npos) {
- return CORSErrorStatus(mojom::CORSError::kMultipleAllowOriginValues,
+ return CorsErrorStatus(mojom::CorsError::kMultipleAllowOriginValues,
*allow_origin_header);
}
// Check valid "null" first since GURL assumes it as invalid.
if (*allow_origin_header == "null") {
- return CORSErrorStatus(mojom::CORSError::kAllowOriginMismatch,
+ return CorsErrorStatus(mojom::CorsError::kAllowOriginMismatch,
*allow_origin_header);
}
@@ -196,11 +196,11 @@
// validation, but should be ok for providing error details to developers.
GURL header_origin(*allow_origin_header);
if (!header_origin.is_valid()) {
- return CORSErrorStatus(mojom::CORSError::kInvalidAllowOriginValue,
+ return CorsErrorStatus(mojom::CorsError::kInvalidAllowOriginValue,
*allow_origin_header);
}
- return CORSErrorStatus(mojom::CORSError::kAllowOriginMismatch,
+ return CorsErrorStatus(mojom::CorsError::kAllowOriginMismatch,
*allow_origin_header);
}
@@ -209,14 +209,14 @@
// This check should be case sensitive.
// See also https://fetch.spec.whatwg.org/#http-new-header-syntax.
if (allow_credentials_header != kLowerCaseTrue) {
- return CORSErrorStatus(mojom::CORSError::kInvalidAllowCredentials,
+ return CorsErrorStatus(mojom::CorsError::kInvalidAllowCredentials,
allow_credentials_header.value_or(std::string()));
}
}
return base::nullopt;
}
-base::Optional<CORSErrorStatus> CheckPreflightAccess(
+base::Optional<CorsErrorStatus> CheckPreflightAccess(
const GURL& response_url,
const int response_status_code,
const base::Optional<std::string>& allow_origin_header,
@@ -231,37 +231,37 @@
// TODO(toyoshim): Remove following two lines when the status code check is
// removed from CheckAccess().
- if (error_status->cors_error == mojom::CORSError::kInvalidResponse)
+ if (error_status->cors_error == mojom::CorsError::kInvalidResponse)
return error_status;
- mojom::CORSError error = error_status->cors_error;
+ mojom::CorsError error = error_status->cors_error;
switch (error_status->cors_error) {
- case mojom::CORSError::kWildcardOriginNotAllowed:
- error = mojom::CORSError::kPreflightWildcardOriginNotAllowed;
+ case mojom::CorsError::kWildcardOriginNotAllowed:
+ error = mojom::CorsError::kPreflightWildcardOriginNotAllowed;
break;
- case mojom::CORSError::kMissingAllowOriginHeader:
- error = mojom::CORSError::kPreflightMissingAllowOriginHeader;
+ case mojom::CorsError::kMissingAllowOriginHeader:
+ error = mojom::CorsError::kPreflightMissingAllowOriginHeader;
break;
- case mojom::CORSError::kMultipleAllowOriginValues:
- error = mojom::CORSError::kPreflightMultipleAllowOriginValues;
+ case mojom::CorsError::kMultipleAllowOriginValues:
+ error = mojom::CorsError::kPreflightMultipleAllowOriginValues;
break;
- case mojom::CORSError::kInvalidAllowOriginValue:
- error = mojom::CORSError::kPreflightInvalidAllowOriginValue;
+ case mojom::CorsError::kInvalidAllowOriginValue:
+ error = mojom::CorsError::kPreflightInvalidAllowOriginValue;
break;
- case mojom::CORSError::kAllowOriginMismatch:
- error = mojom::CORSError::kPreflightAllowOriginMismatch;
+ case mojom::CorsError::kAllowOriginMismatch:
+ error = mojom::CorsError::kPreflightAllowOriginMismatch;
break;
- case mojom::CORSError::kInvalidAllowCredentials:
- error = mojom::CORSError::kPreflightInvalidAllowCredentials;
+ case mojom::CorsError::kInvalidAllowCredentials:
+ error = mojom::CorsError::kPreflightInvalidAllowCredentials;
break;
default:
NOTREACHED();
break;
}
- return CORSErrorStatus(error, error_status->failed_parameter);
+ return CorsErrorStatus(error, error_status->failed_parameter);
}
-base::Optional<CORSErrorStatus> CheckRedirectLocation(
+base::Optional<CorsErrorStatus> CheckRedirectLocation(
const GURL& url,
mojom::FetchRequestMode request_mode,
const base::Optional<url::Origin>& origin,
@@ -278,44 +278,44 @@
// credentials, and either |request|’s tainted origin flag is set or
// |request|’s origin is not same origin with |actualResponse|’s location
// URL’s origin, then return a network error.
- DCHECK(!IsCORSEnabledRequestMode(request_mode) || origin);
- if (IsCORSEnabledRequestMode(request_mode) && url_has_credentials &&
+ DCHECK(!IsCorsEnabledRequestMode(request_mode) || origin);
+ if (IsCorsEnabledRequestMode(request_mode) && url_has_credentials &&
(tainted || !origin->IsSameOriginWith(url::Origin::Create(url)))) {
- return CORSErrorStatus(mojom::CORSError::kRedirectContainsCredentials);
+ return CorsErrorStatus(mojom::CorsError::kRedirectContainsCredentials);
}
// If CORS flag is set and |actualResponse|’s location URL includes
// credentials, then return a network error.
if (cors_flag && url_has_credentials)
- return CORSErrorStatus(mojom::CORSError::kRedirectContainsCredentials);
+ return CorsErrorStatus(mojom::CorsError::kRedirectContainsCredentials);
return base::nullopt;
}
-base::Optional<mojom::CORSError> CheckPreflight(const int status_code) {
+base::Optional<mojom::CorsError> CheckPreflight(const int status_code) {
// CORS preflight with 3XX is considered network error in
// Fetch API Spec: https://fetch.spec.whatwg.org/#cors-preflight-fetch
// CORS Spec: http://www.w3.org/TR/cors/#cross-origin-request-with-preflight-0
// https://crbug.com/452394
if (IsOkStatus(status_code))
return base::nullopt;
- return mojom::CORSError::kPreflightInvalidStatus;
+ return mojom::CorsError::kPreflightInvalidStatus;
}
// https://wicg.github.io/cors-rfc1918/#http-headerdef-access-control-allow-external
-base::Optional<CORSErrorStatus> CheckExternalPreflight(
+base::Optional<CorsErrorStatus> CheckExternalPreflight(
const base::Optional<std::string>& allow_external) {
if (!allow_external)
- return CORSErrorStatus(mojom::CORSError::kPreflightMissingAllowExternal);
+ return CorsErrorStatus(mojom::CorsError::kPreflightMissingAllowExternal);
if (*allow_external == kLowerCaseTrue)
return base::nullopt;
- return CORSErrorStatus(mojom::CORSError::kPreflightInvalidAllowExternal,
+ return CorsErrorStatus(mojom::CorsError::kPreflightInvalidAllowExternal,
*allow_external);
}
-bool IsCORSEnabledRequestMode(mojom::FetchRequestMode mode) {
- return mode == mojom::FetchRequestMode::kCORS ||
- mode == mojom::FetchRequestMode::kCORSWithForcedPreflight;
+bool IsCorsEnabledRequestMode(mojom::FetchRequestMode mode) {
+ return mode == mojom::FetchRequestMode::kCors ||
+ mode == mojom::FetchRequestMode::kCorsWithForcedPreflight;
}
mojom::FetchResponseType CalculateResponseTainting(
@@ -327,8 +327,8 @@
return mojom::FetchResponseType::kBasic;
if (cors_flag) {
- DCHECK(IsCORSEnabledRequestMode(request_mode));
- return mojom::FetchResponseType::kCORS;
+ DCHECK(IsCorsEnabledRequestMode(request_mode));
+ return mojom::FetchResponseType::kCors;
}
if (!origin) {
@@ -337,14 +337,14 @@
return mojom::FetchResponseType::kBasic;
}
- if (request_mode == mojom::FetchRequestMode::kNoCORS &&
+ if (request_mode == mojom::FetchRequestMode::kNoCors &&
!origin->IsSameOriginWith(url::Origin::Create(url))) {
return mojom::FetchResponseType::kOpaque;
}
return mojom::FetchResponseType::kBasic;
}
-bool IsCORSSafelistedMethod(const std::string& method) {
+bool IsCorsSafelistedMethod(const std::string& method) {
// https://fetch.spec.whatwg.org/#cors-safelisted-method
// "A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`."
std::string method_upper = base::ToUpperASCII(method);
@@ -352,11 +352,11 @@
method_upper == kHeadMethod || method_upper == kPostMethod;
}
-bool IsCORSSafelistedContentType(const std::string& media_type) {
- return IsCORSSafelistedLowerCaseContentType(base::ToLowerASCII(media_type));
+bool IsCorsSafelistedContentType(const std::string& media_type) {
+ return IsCorsSafelistedLowerCaseContentType(base::ToLowerASCII(media_type));
}
-bool IsCORSSafelistedHeader(const std::string& name, const std::string& value) {
+bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
// If |value|’s length is greater than 128, then return false.
if (value.size() > 128)
return false;
@@ -416,12 +416,12 @@
}
if (lower_name == "content-type")
- return IsCORSSafelistedLowerCaseContentType(lower_value);
+ return IsCorsSafelistedLowerCaseContentType(lower_value);
return true;
}
-bool IsNoCORSSafelistedHeader(const std::string& name,
+bool IsNoCorsSafelistedHeader(const std::string& name,
const std::string& value) {
const std::string lower_name = base::ToLowerASCII(name);
@@ -430,10 +430,10 @@
return false;
}
- return IsCORSSafelistedHeader(lower_name, value);
+ return IsCorsSafelistedHeader(lower_name, value);
}
-std::vector<std::string> CORSUnsafeRequestHeaderNames(
+std::vector<std::string> CorsUnsafeRequestHeaderNames(
const net::HttpRequestHeaders::HeaderVector& headers) {
std::vector<std::string> potentially_unsafe_names;
std::vector<std::string> header_names;
@@ -442,7 +442,7 @@
size_t safe_list_value_size = 0;
for (const auto& header : headers) {
- if (!IsCORSSafelistedHeader(header.key, header.value)) {
+ if (!IsCorsSafelistedHeader(header.key, header.value)) {
header_names.push_back(base::ToLowerASCII(header.key));
} else {
potentially_unsafe_names.push_back(base::ToLowerASCII(header.key));
@@ -456,7 +456,7 @@
return header_names;
}
-std::vector<std::string> CORSUnsafeNotForbiddenRequestHeaderNames(
+std::vector<std::string> CorsUnsafeNotForbiddenRequestHeaderNames(
const net::HttpRequestHeaders::HeaderVector& headers,
bool is_revalidating) {
std::vector<std::string> header_names;
@@ -477,7 +477,7 @@
continue;
}
}
- if (!IsCORSSafelistedHeader(name, header.value)) {
+ if (!IsCorsSafelistedHeader(name, header.value)) {
header_names.push_back(name);
} else {
potentially_unsafe_names.push_back(name);
@@ -542,10 +542,10 @@
return status >= 200 && status < 300;
}
-bool IsCORSSameOriginResponseType(mojom::FetchResponseType type) {
+bool IsCorsSameOriginResponseType(mojom::FetchResponseType type) {
switch (type) {
case mojom::FetchResponseType::kBasic:
- case mojom::FetchResponseType::kCORS:
+ case mojom::FetchResponseType::kCors:
case mojom::FetchResponseType::kDefault:
return true;
case mojom::FetchResponseType::kError:
@@ -555,10 +555,10 @@
}
}
-bool IsCORSCrossOriginResponseType(mojom::FetchResponseType type) {
+bool IsCorsCrossOriginResponseType(mojom::FetchResponseType type) {
switch (type) {
case mojom::FetchResponseType::kBasic:
- case mojom::FetchResponseType::kCORS:
+ case mojom::FetchResponseType::kCors:
case mojom::FetchResponseType::kDefault:
case mojom::FetchResponseType::kError:
return false;
diff --git a/services/network/public/cpp/cors/cors.h b/services/network/public/cpp/cors/cors.h
index c5db9b15..f80899b 100644
--- a/services/network/public/cpp/cors/cors.h
+++ b/services/network/public/cpp/cors/cors.h
@@ -50,7 +50,7 @@
// Performs a CORS access check on the response parameters.
// This implements https://fetch.spec.whatwg.org/#concept-cors-check
COMPONENT_EXPORT(NETWORK_CPP)
-base::Optional<CORSErrorStatus> CheckAccess(
+base::Optional<CorsErrorStatus> CheckAccess(
const GURL& response_url,
const int response_status_code,
const base::Optional<std::string>& allow_origin_header,
@@ -63,7 +63,7 @@
// step 6, even for a preflight check, |credentials_mode| should be checked on
// the actual request rather than preflight one.
COMPONENT_EXPORT(NETWORK_CPP)
-base::Optional<CORSErrorStatus> CheckPreflightAccess(
+base::Optional<CorsErrorStatus> CheckPreflightAccess(
const GURL& response_url,
const int response_status_code,
const base::Optional<std::string>& allow_origin_header,
@@ -76,7 +76,7 @@
// - the URL has a CORS supported scheme and
// - the URL does not contain the userinfo production.
COMPONENT_EXPORT(NETWORK_CPP)
-base::Optional<CORSErrorStatus> CheckRedirectLocation(
+base::Optional<CorsErrorStatus> CheckRedirectLocation(
const GURL& url,
mojom::FetchRequestMode request_mode,
const base::Optional<url::Origin>& origin,
@@ -87,17 +87,17 @@
// Returns |kPreflightSuccess| if preflight response was successful.
// TODO(toyoshim): Rename to CheckPreflightStatus.
COMPONENT_EXPORT(NETWORK_CPP)
-base::Optional<mojom::CORSError> CheckPreflight(const int status_code);
+base::Optional<mojom::CorsError> CheckPreflight(const int status_code);
// Checks errors for the currently experimental "Access-Control-Allow-External:"
// header. Shares error conditions with standard preflight checking.
// See https://crbug.com/590714.
COMPONENT_EXPORT(NETWORK_CPP)
-base::Optional<CORSErrorStatus> CheckExternalPreflight(
+base::Optional<CorsErrorStatus> CheckExternalPreflight(
const base::Optional<std::string>& allow_external);
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSEnabledRequestMode(mojom::FetchRequestMode mode);
+bool IsCorsEnabledRequestMode(mojom::FetchRequestMode mode);
// Returns the response tainting value
// (https://fetch.spec.whatwg.org/#concept-request-response-tainting) for a
@@ -112,13 +112,13 @@
// Checks safelisted request parameters.
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSSafelistedMethod(const std::string& method);
+bool IsCorsSafelistedMethod(const std::string& method);
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSSafelistedContentType(const std::string& name);
+bool IsCorsSafelistedContentType(const std::string& name);
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSSafelistedHeader(const std::string& name, const std::string& value);
+bool IsCorsSafelistedHeader(const std::string& name, const std::string& value);
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsNoCORSSafelistedHeader(const std::string& name,
+bool IsNoCorsSafelistedHeader(const std::string& name,
const std::string& value);
// https://fetch.spec.whatwg.org/#cors-unsafe-request-header-names
@@ -126,7 +126,7 @@
// The returned list is NOT sorted.
// The returned list consists of lower-cased names.
COMPONENT_EXPORT(NETWORK_CPP)
-std::vector<std::string> CORSUnsafeRequestHeaderNames(
+std::vector<std::string> CorsUnsafeRequestHeaderNames(
const net::HttpRequestHeaders::HeaderVector& headers);
// https://fetch.spec.whatwg.org/#cors-unsafe-request-header-names
@@ -137,13 +137,13 @@
// The returned list is NOT sorted.
// The returned list consists of lower-cased names.
COMPONENT_EXPORT(NETWORK_CPP)
-std::vector<std::string> CORSUnsafeNotForbiddenRequestHeaderNames(
+std::vector<std::string> CorsUnsafeNotForbiddenRequestHeaderNames(
const net::HttpRequestHeaders::HeaderVector& headers,
bool is_revalidating);
// Checks forbidden method in the fetch spec.
// See https://fetch.spec.whatwg.org/#forbidden-method.
-// TODO(toyoshim): Move Blink FetchUtils::IsForbiddenMethod to CORS:: and use
+// TODO(toyoshim): Move Blink FetchUtils::IsForbiddenMethod to cors:: and use
// this implementation internally.
COMPONENT_EXPORT(NETWORK_CPP) bool IsForbiddenMethod(const std::string& name);
@@ -159,12 +159,12 @@
// Returns true if |type| is a response type which makes a response
// CORS-same-origin. See https://html.spec.whatwg.org/#cors-same-origin.
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSSameOriginResponseType(mojom::FetchResponseType type);
+bool IsCorsSameOriginResponseType(mojom::FetchResponseType type);
// Returns true if |type| is a response type which makes a response
// CORS-cross-origin. See https://html.spec.whatwg.org/#cors-cross-origin.
COMPONENT_EXPORT(NETWORK_CPP)
-bool IsCORSCrossOriginResponseType(mojom::FetchResponseType type);
+bool IsCorsCrossOriginResponseType(mojom::FetchResponseType type);
// Returns true if the credentials flag should be set for the given arguments
// as in https://fetch.spec.whatwg.org/#http-network-or-cache-fetch.
diff --git a/services/network/public/cpp/cors/cors_error_status.cc b/services/network/public/cpp/cors/cors_error_status.cc
index a8bd29f..e1a21928 100644
--- a/services/network/public/cpp/cors/cors_error_status.cc
+++ b/services/network/public/cpp/cors/cors_error_status.cc
@@ -11,20 +11,20 @@
// Note: |cors_error| is initialized to kLast to keep the value inside the
// valid enum value range. The value is meaningless and should be overriden
// immediately by IPC desrtialization code.
-CORSErrorStatus::CORSErrorStatus()
- : CORSErrorStatus(mojom::CORSError::kMaxValue) {}
+CorsErrorStatus::CorsErrorStatus()
+ : CorsErrorStatus(mojom::CorsError::kMaxValue) {}
-CORSErrorStatus::CORSErrorStatus(const CORSErrorStatus& status) = default;
+CorsErrorStatus::CorsErrorStatus(const CorsErrorStatus& status) = default;
-CORSErrorStatus::CORSErrorStatus(mojom::CORSError error) : cors_error(error) {}
+CorsErrorStatus::CorsErrorStatus(mojom::CorsError error) : cors_error(error) {}
-CORSErrorStatus::CORSErrorStatus(mojom::CORSError error,
+CorsErrorStatus::CorsErrorStatus(mojom::CorsError error,
const std::string& failed_parameter)
: cors_error(error), failed_parameter(failed_parameter) {}
-CORSErrorStatus::~CORSErrorStatus() = default;
+CorsErrorStatus::~CorsErrorStatus() = default;
-bool CORSErrorStatus::operator==(const CORSErrorStatus& rhs) const {
+bool CorsErrorStatus::operator==(const CorsErrorStatus& rhs) const {
return cors_error == rhs.cors_error &&
failed_parameter == rhs.failed_parameter;
}
diff --git a/services/network/public/cpp/cors/cors_error_status.h b/services/network/public/cpp/cors/cors_error_status.h
index 6df12c4f..3e79c69 100644
--- a/services/network/public/cpp/cors/cors_error_status.h
+++ b/services/network/public/cpp/cors/cors_error_status.h
@@ -14,24 +14,24 @@
namespace network {
-struct COMPONENT_EXPORT(NETWORK_CPP_BASE) CORSErrorStatus {
+struct COMPONENT_EXPORT(NETWORK_CPP_BASE) CorsErrorStatus {
// This constructor is used by generated IPC serialization code.
// Should not use this explicitly.
// TODO(toyoshim, yhirano): Exploring a way to make this private, and allows
// only serialization code for mojo can access.
- CORSErrorStatus();
+ CorsErrorStatus();
- CORSErrorStatus(const CORSErrorStatus& status);
+ CorsErrorStatus(const CorsErrorStatus& status);
- explicit CORSErrorStatus(mojom::CORSError error);
- CORSErrorStatus(mojom::CORSError error, const std::string& failed_parameter);
+ explicit CorsErrorStatus(mojom::CorsError error);
+ CorsErrorStatus(mojom::CorsError error, const std::string& failed_parameter);
- ~CORSErrorStatus();
+ ~CorsErrorStatus();
- bool operator==(const CORSErrorStatus& rhs) const;
- bool operator!=(const CORSErrorStatus& rhs) const { return !(*this == rhs); }
+ bool operator==(const CorsErrorStatus& rhs) const;
+ bool operator!=(const CorsErrorStatus& rhs) const { return !(*this == rhs); }
- mojom::CORSError cors_error;
+ mojom::CorsError cors_error;
// Contains request method name, or header name that didn't pass a CORS check.
std::string failed_parameter;
diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
index dc9295a..af6c3bb 100644
--- a/services/network/public/cpp/cors/cors_legacy.h
+++ b/services/network/public/cpp/cors/cors_legacy.h
@@ -23,7 +23,7 @@
namespace legacy {
// Registers whitelisted secure origins and hostname patterns for CORS checks in
-// CORSURLLoader.
+// CorsURLLoader.
COMPONENT_EXPORT(NETWORK_CPP)
void RegisterSecureOrigins(const std::vector<std::string>& secure_origins);
diff --git a/services/network/public/cpp/cors/cors_unittest.cc b/services/network/public/cpp/cors/cors_unittest.cc
index 537ba88..f285e40 100644
--- a/services/network/public/cpp/cors/cors_unittest.cc
+++ b/services/network/public/cpp/cors/cors_unittest.cc
@@ -14,27 +14,27 @@
namespace cors {
namespace {
-using CORSTest = testing::Test;
+using CorsTest = testing::Test;
-TEST_F(CORSTest, CheckAccessDetectsInvalidResponse) {
- base::Optional<CORSErrorStatus> error_status =
+TEST_F(CorsTest, CheckAccessDetectsInvalidResponse) {
+ base::Optional<CorsErrorStatus> error_status =
CheckAccess(GURL(), 0 /* response_status_code */,
base::nullopt /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, url::Origin());
ASSERT_TRUE(error_status);
- EXPECT_EQ(mojom::CORSError::kInvalidResponse, error_status->cors_error);
+ EXPECT_EQ(mojom::CorsError::kInvalidResponse, error_status->cors_error);
}
// Tests if CheckAccess detects kWildcardOriginNotAllowed error correctly.
-TEST_F(CORSTest, CheckAccessDetectsWildcardOriginNotAllowed) {
+TEST_F(CorsTest, CheckAccessDetectsWildcardOriginNotAllowed) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
const std::string allow_all_header("*");
// Access-Control-Allow-Origin '*' works.
- base::Optional<CORSErrorStatus> error1 =
+ base::Optional<CorsErrorStatus> error1 =
CheckAccess(response_url, response_status_code,
allow_all_header /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
@@ -43,95 +43,95 @@
// Access-Control-Allow-Origin '*' should not be allowed if credentials mode
// is kInclude.
- base::Optional<CORSErrorStatus> error2 =
+ base::Optional<CorsErrorStatus> error2 =
CheckAccess(response_url, response_status_code,
allow_all_header /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kInclude, origin);
ASSERT_TRUE(error2);
- EXPECT_EQ(mojom::CORSError::kWildcardOriginNotAllowed, error2->cors_error);
+ EXPECT_EQ(mojom::CorsError::kWildcardOriginNotAllowed, error2->cors_error);
}
// Tests if CheckAccess detects kMissingAllowOriginHeader error correctly.
-TEST_F(CORSTest, CheckAccessDetectsMissingAllowOriginHeader) {
+TEST_F(CorsTest, CheckAccessDetectsMissingAllowOriginHeader) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
// Access-Control-Allow-Origin is missed.
- base::Optional<CORSErrorStatus> error =
+ base::Optional<CorsErrorStatus> error =
CheckAccess(response_url, response_status_code,
base::nullopt /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_TRUE(error);
- EXPECT_EQ(mojom::CORSError::kMissingAllowOriginHeader, error->cors_error);
+ EXPECT_EQ(mojom::CorsError::kMissingAllowOriginHeader, error->cors_error);
}
// Tests if CheckAccess detects kMultipleAllowOriginValues error
// correctly.
-TEST_F(CORSTest, CheckAccessDetectsMultipleAllowOriginValues) {
+TEST_F(CorsTest, CheckAccessDetectsMultipleAllowOriginValues) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
const std::string space_separated_multiple_origins(
"http://example.com http://another.example.com");
- base::Optional<CORSErrorStatus> error1 =
+ base::Optional<CorsErrorStatus> error1 =
CheckAccess(response_url, response_status_code,
space_separated_multiple_origins /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_TRUE(error1);
- EXPECT_EQ(mojom::CORSError::kMultipleAllowOriginValues, error1->cors_error);
+ EXPECT_EQ(mojom::CorsError::kMultipleAllowOriginValues, error1->cors_error);
const std::string comma_separated_multiple_origins(
"http://example.com,http://another.example.com");
- base::Optional<CORSErrorStatus> error2 =
+ base::Optional<CorsErrorStatus> error2 =
CheckAccess(response_url, response_status_code,
comma_separated_multiple_origins /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_TRUE(error2);
- EXPECT_EQ(mojom::CORSError::kMultipleAllowOriginValues, error2->cors_error);
+ EXPECT_EQ(mojom::CorsError::kMultipleAllowOriginValues, error2->cors_error);
}
// Tests if CheckAccess detects kInvalidAllowOriginValue error correctly.
-TEST_F(CORSTest, CheckAccessDetectsInvalidAllowOriginValue) {
+TEST_F(CorsTest, CheckAccessDetectsInvalidAllowOriginValue) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
- base::Optional<CORSErrorStatus> error =
+ base::Optional<CorsErrorStatus> error =
CheckAccess(response_url, response_status_code,
std::string("invalid.origin") /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_TRUE(error);
- EXPECT_EQ(mojom::CORSError::kInvalidAllowOriginValue, error->cors_error);
+ EXPECT_EQ(mojom::CorsError::kInvalidAllowOriginValue, error->cors_error);
EXPECT_EQ("invalid.origin", error->failed_parameter);
}
// Tests if CheckAccess detects kAllowOriginMismatch error correctly.
-TEST_F(CORSTest, CheckAccessDetectsAllowOriginMismatch) {
+TEST_F(CorsTest, CheckAccessDetectsAllowOriginMismatch) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
- base::Optional<CORSErrorStatus> error1 =
+ base::Optional<CorsErrorStatus> error1 =
CheckAccess(response_url, response_status_code,
origin.Serialize() /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_FALSE(error1);
- base::Optional<CORSErrorStatus> error2 = CheckAccess(
+ base::Optional<CorsErrorStatus> error2 = CheckAccess(
response_url, response_status_code,
std::string("http://not.google.com") /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, origin);
ASSERT_TRUE(error2);
- EXPECT_EQ(mojom::CORSError::kAllowOriginMismatch, error2->cors_error);
+ EXPECT_EQ(mojom::CorsError::kAllowOriginMismatch, error2->cors_error);
EXPECT_EQ("http://not.google.com", error2->failed_parameter);
// Allow "null" value to match serialized unique origins.
@@ -139,7 +139,7 @@
const url::Origin null_origin;
EXPECT_EQ(null_string, null_origin.Serialize());
- base::Optional<CORSErrorStatus> error3 = CheckAccess(
+ base::Optional<CorsErrorStatus> error3 = CheckAccess(
response_url, response_status_code, null_string /* allow_origin_header */,
base::nullopt /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kOmit, null_origin);
@@ -147,43 +147,43 @@
}
// Tests if CheckAccess detects kInvalidAllowCredentials error correctly.
-TEST_F(CORSTest, CheckAccessDetectsInvalidAllowCredential) {
+TEST_F(CorsTest, CheckAccessDetectsInvalidAllowCredential) {
const GURL response_url("http://example.com/data");
const url::Origin origin = url::Origin::Create(GURL("http://google.com"));
const int response_status_code = 200;
- base::Optional<CORSErrorStatus> error1 =
+ base::Optional<CorsErrorStatus> error1 =
CheckAccess(response_url, response_status_code,
origin.Serialize() /* allow_origin_header */,
std::string("true") /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kInclude, origin);
ASSERT_FALSE(error1);
- base::Optional<CORSErrorStatus> error2 =
+ base::Optional<CorsErrorStatus> error2 =
CheckAccess(response_url, response_status_code,
origin.Serialize() /* allow_origin_header */,
std::string("fuga") /* allow_credentials_header */,
network::mojom::FetchCredentialsMode::kInclude, origin);
ASSERT_TRUE(error2);
- EXPECT_EQ(mojom::CORSError::kInvalidAllowCredentials, error2->cors_error);
+ EXPECT_EQ(mojom::CorsError::kInvalidAllowCredentials, error2->cors_error);
EXPECT_EQ("fuga", error2->failed_parameter);
}
-// Tests if CheckRedirectLocation detects kCORSDisabledScheme and
+// Tests if CheckRedirectLocation detects kCorsDisabledScheme and
// kRedirectContainsCredentials errors correctly.
-TEST_F(CORSTest, CheckRedirectLocation) {
+TEST_F(CorsTest, CheckRedirectLocation) {
struct TestCase {
GURL url;
mojom::FetchRequestMode request_mode;
bool cors_flag;
bool tainted;
- base::Optional<CORSErrorStatus> expectation;
+ base::Optional<CorsErrorStatus> expectation;
};
- const auto kCORS = mojom::FetchRequestMode::kCORS;
- const auto kCORSWithForcedPreflight =
- mojom::FetchRequestMode::kCORSWithForcedPreflight;
- const auto kNoCORS = mojom::FetchRequestMode::kNoCORS;
+ const auto kCors = mojom::FetchRequestMode::kCors;
+ const auto kCorsWithForcedPreflight =
+ mojom::FetchRequestMode::kCorsWithForcedPreflight;
+ const auto kNoCors = mojom::FetchRequestMode::kNoCors;
const url::Origin origin = url::Origin::Create(GURL("http://example.com/"));
const GURL same_origin_url("http://example.com/");
@@ -194,81 +194,81 @@
const GURL cross_origin_url_with_user("http://[email protected]/");
const GURL cross_origin_url_with_pass("http://:[email protected]/");
const auto ok = base::nullopt;
- const CORSErrorStatus kCORSDisabledScheme(
- mojom::CORSError::kCORSDisabledScheme);
- const CORSErrorStatus kRedirectContainsCredentials(
- mojom::CORSError::kRedirectContainsCredentials);
+ const CorsErrorStatus kCorsDisabledScheme(
+ mojom::CorsError::kCorsDisabledScheme);
+ const CorsErrorStatus kRedirectContainsCredentials(
+ mojom::CorsError::kRedirectContainsCredentials);
TestCase cases[] = {
// "cors", no credentials information
- {same_origin_url, kCORS, false, false, ok},
- {cross_origin_url, kCORS, false, false, ok},
- {data_url, kCORS, false, false, ok},
- {same_origin_url, kCORS, true, false, ok},
- {cross_origin_url, kCORS, true, false, ok},
- {data_url, kCORS, true, false, ok},
- {same_origin_url, kCORS, false, true, ok},
- {cross_origin_url, kCORS, false, true, ok},
- {data_url, kCORS, false, true, ok},
- {same_origin_url, kCORS, true, true, ok},
- {cross_origin_url, kCORS, true, true, ok},
- {data_url, kCORS, true, true, ok},
+ {same_origin_url, kCors, false, false, ok},
+ {cross_origin_url, kCors, false, false, ok},
+ {data_url, kCors, false, false, ok},
+ {same_origin_url, kCors, true, false, ok},
+ {cross_origin_url, kCors, true, false, ok},
+ {data_url, kCors, true, false, ok},
+ {same_origin_url, kCors, false, true, ok},
+ {cross_origin_url, kCors, false, true, ok},
+ {data_url, kCors, false, true, ok},
+ {same_origin_url, kCors, true, true, ok},
+ {cross_origin_url, kCors, true, true, ok},
+ {data_url, kCors, true, true, ok},
// "cors" with forced preflight, no credentials information
- {same_origin_url, kCORSWithForcedPreflight, false, false, ok},
- {cross_origin_url, kCORSWithForcedPreflight, false, false, ok},
- {data_url, kCORSWithForcedPreflight, false, false, ok},
- {same_origin_url, kCORSWithForcedPreflight, true, false, ok},
- {cross_origin_url, kCORSWithForcedPreflight, true, false, ok},
- {data_url, kCORSWithForcedPreflight, true, false, ok},
- {same_origin_url, kCORSWithForcedPreflight, false, true, ok},
- {cross_origin_url, kCORSWithForcedPreflight, false, true, ok},
- {data_url, kCORSWithForcedPreflight, false, true, ok},
- {same_origin_url, kCORSWithForcedPreflight, true, true, ok},
- {cross_origin_url, kCORSWithForcedPreflight, true, true, ok},
- {data_url, kCORSWithForcedPreflight, true, true, ok},
+ {same_origin_url, kCorsWithForcedPreflight, false, false, ok},
+ {cross_origin_url, kCorsWithForcedPreflight, false, false, ok},
+ {data_url, kCorsWithForcedPreflight, false, false, ok},
+ {same_origin_url, kCorsWithForcedPreflight, true, false, ok},
+ {cross_origin_url, kCorsWithForcedPreflight, true, false, ok},
+ {data_url, kCorsWithForcedPreflight, true, false, ok},
+ {same_origin_url, kCorsWithForcedPreflight, false, true, ok},
+ {cross_origin_url, kCorsWithForcedPreflight, false, true, ok},
+ {data_url, kCorsWithForcedPreflight, false, true, ok},
+ {same_origin_url, kCorsWithForcedPreflight, true, true, ok},
+ {cross_origin_url, kCorsWithForcedPreflight, true, true, ok},
+ {data_url, kCorsWithForcedPreflight, true, true, ok},
// "no-cors", no credentials information
- {same_origin_url, kNoCORS, false, false, ok},
- {cross_origin_url, kNoCORS, false, false, ok},
- {data_url, kNoCORS, false, false, ok},
- {same_origin_url, kNoCORS, false, true, ok},
- {cross_origin_url, kNoCORS, false, true, ok},
- {data_url, kNoCORS, false, true, ok},
+ {same_origin_url, kNoCors, false, false, ok},
+ {cross_origin_url, kNoCors, false, false, ok},
+ {data_url, kNoCors, false, false, ok},
+ {same_origin_url, kNoCors, false, true, ok},
+ {cross_origin_url, kNoCors, false, true, ok},
+ {data_url, kNoCors, false, true, ok},
// with credentials information (same origin)
- {same_origin_url_with_user, kCORS, false, false, ok},
- {same_origin_url_with_user, kCORS, true, false,
+ {same_origin_url_with_user, kCors, false, false, ok},
+ {same_origin_url_with_user, kCors, true, false,
kRedirectContainsCredentials},
- {same_origin_url_with_user, kCORS, true, true,
+ {same_origin_url_with_user, kCors, true, true,
kRedirectContainsCredentials},
- {same_origin_url_with_user, kNoCORS, false, false, ok},
- {same_origin_url_with_user, kNoCORS, false, true, ok},
- {same_origin_url_with_pass, kCORS, false, false, ok},
- {same_origin_url_with_pass, kCORS, true, false,
+ {same_origin_url_with_user, kNoCors, false, false, ok},
+ {same_origin_url_with_user, kNoCors, false, true, ok},
+ {same_origin_url_with_pass, kCors, false, false, ok},
+ {same_origin_url_with_pass, kCors, true, false,
kRedirectContainsCredentials},
- {same_origin_url_with_pass, kCORS, true, true,
+ {same_origin_url_with_pass, kCors, true, true,
kRedirectContainsCredentials},
- {same_origin_url_with_pass, kNoCORS, false, false, ok},
- {same_origin_url_with_pass, kNoCORS, false, true, ok},
+ {same_origin_url_with_pass, kNoCors, false, false, ok},
+ {same_origin_url_with_pass, kNoCors, false, true, ok},
// with credentials information (cross origin)
- {cross_origin_url_with_user, kCORS, false, false,
+ {cross_origin_url_with_user, kCors, false, false,
kRedirectContainsCredentials},
- {cross_origin_url_with_user, kCORS, true, false,
+ {cross_origin_url_with_user, kCors, true, false,
kRedirectContainsCredentials},
- {cross_origin_url_with_user, kCORS, true, true,
+ {cross_origin_url_with_user, kCors, true, true,
kRedirectContainsCredentials},
- {cross_origin_url_with_user, kNoCORS, false, true, ok},
- {cross_origin_url_with_user, kNoCORS, false, false, ok},
- {cross_origin_url_with_pass, kCORS, false, false,
+ {cross_origin_url_with_user, kNoCors, false, true, ok},
+ {cross_origin_url_with_user, kNoCors, false, false, ok},
+ {cross_origin_url_with_pass, kCors, false, false,
kRedirectContainsCredentials},
- {cross_origin_url_with_pass, kCORS, true, false,
+ {cross_origin_url_with_pass, kCors, true, false,
kRedirectContainsCredentials},
- {cross_origin_url_with_pass, kCORS, true, true,
+ {cross_origin_url_with_pass, kCors, true, true,
kRedirectContainsCredentials},
- {cross_origin_url_with_pass, kNoCORS, false, true, ok},
- {cross_origin_url_with_pass, kNoCORS, false, false, ok},
+ {cross_origin_url_with_pass, kNoCors, false, true, ok},
+ {cross_origin_url_with_pass, kNoCors, false, false, ok},
};
for (const auto& test : cases) {
@@ -284,32 +284,32 @@
}
}
-TEST_F(CORSTest, CheckPreflightDetectsErrors) {
+TEST_F(CorsTest, CheckPreflightDetectsErrors) {
EXPECT_FALSE(CheckPreflight(200));
EXPECT_FALSE(CheckPreflight(299));
- base::Optional<mojom::CORSError> error1 = CheckPreflight(300);
+ base::Optional<mojom::CorsError> error1 = CheckPreflight(300);
ASSERT_TRUE(error1);
- EXPECT_EQ(mojom::CORSError::kPreflightInvalidStatus, *error1);
+ EXPECT_EQ(mojom::CorsError::kPreflightInvalidStatus, *error1);
EXPECT_FALSE(CheckExternalPreflight(std::string("true")));
- base::Optional<CORSErrorStatus> error2 =
+ base::Optional<CorsErrorStatus> error2 =
CheckExternalPreflight(base::nullopt);
ASSERT_TRUE(error2);
- EXPECT_EQ(mojom::CORSError::kPreflightMissingAllowExternal,
+ EXPECT_EQ(mojom::CorsError::kPreflightMissingAllowExternal,
error2->cors_error);
EXPECT_EQ("", error2->failed_parameter);
- base::Optional<CORSErrorStatus> error3 =
+ base::Optional<CorsErrorStatus> error3 =
CheckExternalPreflight(std::string("TRUE"));
ASSERT_TRUE(error3);
- EXPECT_EQ(mojom::CORSError::kPreflightInvalidAllowExternal,
+ EXPECT_EQ(mojom::CorsError::kPreflightInvalidAllowExternal,
error3->cors_error);
EXPECT_EQ("TRUE", error3->failed_parameter);
}
-TEST_F(CORSTest, CalculateResponseTainting) {
+TEST_F(CorsTest, CalculateResponseTainting) {
using mojom::FetchResponseType;
using mojom::FetchRequestMode;
@@ -324,13 +324,13 @@
same_origin_url, FetchRequestMode::kSameOrigin, origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
- same_origin_url, FetchRequestMode::kNoCORS, origin, false));
+ same_origin_url, FetchRequestMode::kNoCors, origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
- CalculateResponseTainting(same_origin_url, FetchRequestMode::kCORS,
+ CalculateResponseTainting(same_origin_url, FetchRequestMode::kCors,
origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
- same_origin_url, FetchRequestMode::kCORSWithForcedPreflight,
+ same_origin_url, FetchRequestMode::kCorsWithForcedPreflight,
origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
@@ -339,67 +339,67 @@
// CORS flag is false, cross-origin request
EXPECT_EQ(FetchResponseType::kOpaque,
CalculateResponseTainting(
- cross_origin_url, FetchRequestMode::kNoCORS, origin, false));
+ cross_origin_url, FetchRequestMode::kNoCors, origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
cross_origin_url, FetchRequestMode::kNavigate, origin, false));
// CORS flag is true, same-origin request
- EXPECT_EQ(FetchResponseType::kCORS,
- CalculateResponseTainting(same_origin_url, FetchRequestMode::kCORS,
+ EXPECT_EQ(FetchResponseType::kCors,
+ CalculateResponseTainting(same_origin_url, FetchRequestMode::kCors,
origin, true));
- EXPECT_EQ(FetchResponseType::kCORS,
+ EXPECT_EQ(FetchResponseType::kCors,
CalculateResponseTainting(
- same_origin_url, FetchRequestMode::kCORSWithForcedPreflight,
+ same_origin_url, FetchRequestMode::kCorsWithForcedPreflight,
origin, true));
// CORS flag is true, cross-origin request
- EXPECT_EQ(FetchResponseType::kCORS,
- CalculateResponseTainting(cross_origin_url, FetchRequestMode::kCORS,
+ EXPECT_EQ(FetchResponseType::kCors,
+ CalculateResponseTainting(cross_origin_url, FetchRequestMode::kCors,
origin, true));
- EXPECT_EQ(FetchResponseType::kCORS,
+ EXPECT_EQ(FetchResponseType::kCors,
CalculateResponseTainting(
- cross_origin_url, FetchRequestMode::kCORSWithForcedPreflight,
+ cross_origin_url, FetchRequestMode::kCorsWithForcedPreflight,
origin, true));
// Origin is not provided.
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
- same_origin_url, FetchRequestMode::kNoCORS, no_origin, false));
+ same_origin_url, FetchRequestMode::kNoCors, no_origin, false));
EXPECT_EQ(
FetchResponseType::kBasic,
CalculateResponseTainting(same_origin_url, FetchRequestMode::kNavigate,
no_origin, false));
EXPECT_EQ(FetchResponseType::kBasic,
CalculateResponseTainting(
- cross_origin_url, FetchRequestMode::kNoCORS, no_origin, false));
+ cross_origin_url, FetchRequestMode::kNoCors, no_origin, false));
EXPECT_EQ(
FetchResponseType::kBasic,
CalculateResponseTainting(cross_origin_url, FetchRequestMode::kNavigate,
no_origin, false));
}
-TEST_F(CORSTest, SafelistedMethod) {
+TEST_F(CorsTest, SafelistedMethod) {
// Method check should be case-insensitive.
- EXPECT_TRUE(IsCORSSafelistedMethod("get"));
- EXPECT_TRUE(IsCORSSafelistedMethod("Get"));
- EXPECT_TRUE(IsCORSSafelistedMethod("GET"));
- EXPECT_TRUE(IsCORSSafelistedMethod("HEAD"));
- EXPECT_TRUE(IsCORSSafelistedMethod("POST"));
- EXPECT_FALSE(IsCORSSafelistedMethod("OPTIONS"));
+ EXPECT_TRUE(IsCorsSafelistedMethod("get"));
+ EXPECT_TRUE(IsCorsSafelistedMethod("Get"));
+ EXPECT_TRUE(IsCorsSafelistedMethod("GET"));
+ EXPECT_TRUE(IsCorsSafelistedMethod("HEAD"));
+ EXPECT_TRUE(IsCorsSafelistedMethod("POST"));
+ EXPECT_FALSE(IsCorsSafelistedMethod("OPTIONS"));
}
-TEST_F(CORSTest, SafelistedHeader) {
+TEST_F(CorsTest, SafelistedHeader) {
// See SafelistedAccept/AcceptLanguage/ContentLanguage/ContentType also.
- EXPECT_TRUE(IsCORSSafelistedHeader("accept", "foo"));
- EXPECT_FALSE(IsCORSSafelistedHeader("foo", "bar"));
- EXPECT_FALSE(IsCORSSafelistedHeader("user-agent", "foo"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept", "foo"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("foo", "bar"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("user-agent", "foo"));
}
-TEST_F(CORSTest, SafelistedAccept) {
- EXPECT_TRUE(IsCORSSafelistedHeader("accept", "text/html"));
- EXPECT_TRUE(IsCORSSafelistedHeader("AccepT", "text/html"));
+TEST_F(CorsTest, SafelistedAccept) {
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept", "text/html"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("AccepT", "text/html"));
constexpr char kAllowed[] =
"\t !#$%&'*+,-./0123456789;="
@@ -410,26 +410,26 @@
// 1 for the trailing null character.
auto* end = kAllowed + base::size(kAllowed) - 1;
EXPECT_EQ(std::find(kAllowed, end, c) != end,
- IsCORSSafelistedHeader("accept", std::string(1, c)));
+ IsCorsSafelistedHeader("accept", std::string(1, c)));
EXPECT_EQ(std::find(kAllowed, end, c) != end,
- IsCORSSafelistedHeader("AccepT", std::string(1, c)));
+ IsCorsSafelistedHeader("AccepT", std::string(1, c)));
}
for (int i = 128; i <= 255; ++i) {
SCOPED_TRACE(testing::Message() << "c = static_cast<char>(" << i << ")");
char c = static_cast<char>(static_cast<unsigned char>(i));
- EXPECT_TRUE(IsCORSSafelistedHeader("accept", std::string(1, c)));
- EXPECT_TRUE(IsCORSSafelistedHeader("AccepT", std::string(1, c)));
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept", std::string(1, c)));
+ EXPECT_TRUE(IsCorsSafelistedHeader("AccepT", std::string(1, c)));
}
- EXPECT_TRUE(IsCORSSafelistedHeader("accept", std::string(128, 'a')));
- EXPECT_FALSE(IsCORSSafelistedHeader("accept", std::string(129, 'a')));
- EXPECT_TRUE(IsCORSSafelistedHeader("AccepT", std::string(128, 'a')));
- EXPECT_FALSE(IsCORSSafelistedHeader("AccepT", std::string(129, 'a')));
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept", std::string(128, 'a')));
+ EXPECT_FALSE(IsCorsSafelistedHeader("accept", std::string(129, 'a')));
+ EXPECT_TRUE(IsCorsSafelistedHeader("AccepT", std::string(128, 'a')));
+ EXPECT_FALSE(IsCorsSafelistedHeader("AccepT", std::string(129, 'a')));
}
-TEST_F(CORSTest, SafelistedAcceptLanguage) {
- EXPECT_TRUE(IsCORSSafelistedHeader("accept-language", "en,ja"));
- EXPECT_TRUE(IsCORSSafelistedHeader("aCcEPT-lAngUAge", "en,ja"));
+TEST_F(CorsTest, SafelistedAcceptLanguage) {
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept-language", "en,ja"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("aCcEPT-lAngUAge", "en,ja"));
constexpr char kAllowed[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz *,-.;=";
@@ -439,19 +439,19 @@
// 1 for the trailing null character.
auto* end = kAllowed + base::size(kAllowed) - 1;
EXPECT_EQ(std::find(kAllowed, end, c) != end,
- IsCORSSafelistedHeader("aCcEPT-lAngUAge", std::string(1, c)));
+ IsCorsSafelistedHeader("aCcEPT-lAngUAge", std::string(1, c)));
}
- EXPECT_TRUE(IsCORSSafelistedHeader("accept-language", std::string(128, 'a')));
+ EXPECT_TRUE(IsCorsSafelistedHeader("accept-language", std::string(128, 'a')));
EXPECT_FALSE(
- IsCORSSafelistedHeader("accept-language", std::string(129, 'a')));
- EXPECT_TRUE(IsCORSSafelistedHeader("aCcEPT-lAngUAge", std::string(128, 'a')));
+ IsCorsSafelistedHeader("accept-language", std::string(129, 'a')));
+ EXPECT_TRUE(IsCorsSafelistedHeader("aCcEPT-lAngUAge", std::string(128, 'a')));
EXPECT_FALSE(
- IsCORSSafelistedHeader("aCcEPT-lAngUAge", std::string(129, 'a')));
+ IsCorsSafelistedHeader("aCcEPT-lAngUAge", std::string(129, 'a')));
}
-TEST_F(CORSTest, SafelistedContentLanguage) {
- EXPECT_TRUE(IsCORSSafelistedHeader("content-language", "en,ja"));
- EXPECT_TRUE(IsCORSSafelistedHeader("cONTent-LANguaGe", "en,ja"));
+TEST_F(CorsTest, SafelistedContentLanguage) {
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-language", "en,ja"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("cONTent-LANguaGe", "en,ja"));
constexpr char kAllowed[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz *,-.;=";
@@ -461,21 +461,21 @@
// 1 for the trailing null character.
auto* end = kAllowed + base::size(kAllowed) - 1;
EXPECT_EQ(std::find(kAllowed, end, c) != end,
- IsCORSSafelistedHeader("content-language", std::string(1, c)));
+ IsCorsSafelistedHeader("content-language", std::string(1, c)));
EXPECT_EQ(std::find(kAllowed, end, c) != end,
- IsCORSSafelistedHeader("cONTent-LANguaGe", std::string(1, c)));
+ IsCorsSafelistedHeader("cONTent-LANguaGe", std::string(1, c)));
}
EXPECT_TRUE(
- IsCORSSafelistedHeader("content-language", std::string(128, 'a')));
+ IsCorsSafelistedHeader("content-language", std::string(128, 'a')));
EXPECT_FALSE(
- IsCORSSafelistedHeader("content-language", std::string(129, 'a')));
+ IsCorsSafelistedHeader("content-language", std::string(129, 'a')));
EXPECT_TRUE(
- IsCORSSafelistedHeader("cONTent-LANguaGe", std::string(128, 'a')));
+ IsCorsSafelistedHeader("cONTent-LANguaGe", std::string(128, 'a')));
EXPECT_FALSE(
- IsCORSSafelistedHeader("cONTent-LANguaGe", std::string(129, 'a')));
+ IsCorsSafelistedHeader("cONTent-LANguaGe", std::string(129, 'a')));
}
-TEST_F(CORSTest, SafelistedContentType) {
+TEST_F(CorsTest, SafelistedContentType) {
constexpr char kAllowed[] =
"\t !#$%&'*+,-./0123456789;="
"ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~";
@@ -487,106 +487,106 @@
const bool is_allowed = std::find(kAllowed, end, c) != end;
const std::string value = std::string("text/plain; charset=") + c;
- EXPECT_EQ(is_allowed, IsCORSSafelistedHeader("content-type", value));
- EXPECT_EQ(is_allowed, IsCORSSafelistedHeader("cONtent-tYPe", value));
+ EXPECT_EQ(is_allowed, IsCorsSafelistedHeader("content-type", value));
+ EXPECT_EQ(is_allowed, IsCorsSafelistedHeader("cONtent-tYPe", value));
}
for (int i = 128; i <= 255; ++i) {
SCOPED_TRACE(testing::Message() << "c = static_cast<char>(" << i << ")");
char c = static_cast<char>(static_cast<unsigned char>(i));
const std::string value = std::string("text/plain; charset=") + c;
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type", value));
- EXPECT_TRUE(IsCORSSafelistedHeader("ConTEnt-Type", value));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type", value));
+ EXPECT_TRUE(IsCorsSafelistedHeader("ConTEnt-Type", value));
}
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type", "text/plain"));
- EXPECT_TRUE(IsCORSSafelistedHeader("CoNtEnt-TyPE", "text/plain"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type", "text/plain"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("CoNtEnt-TyPE", "text/plain"));
EXPECT_TRUE(
- IsCORSSafelistedHeader("content-type", "text/plain; charset=utf-8"));
+ IsCorsSafelistedHeader("content-type", "text/plain; charset=utf-8"));
EXPECT_TRUE(
- IsCORSSafelistedHeader("content-type", " text/plain ; charset=UTF-8"));
+ IsCorsSafelistedHeader("content-type", " text/plain ; charset=UTF-8"));
EXPECT_TRUE(
- IsCORSSafelistedHeader("content-type", "text/plain; param=BOGUS"));
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type",
+ IsCorsSafelistedHeader("content-type", "text/plain; param=BOGUS"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type",
"application/x-www-form-urlencoded"));
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type", "multipart/form-data"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type", "multipart/form-data"));
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type", "Text/plain"));
- EXPECT_TRUE(IsCORSSafelistedHeader("content-type", "tEXT/PLAIN"));
- EXPECT_FALSE(IsCORSSafelistedHeader("content-type", "text/html"));
- EXPECT_FALSE(IsCORSSafelistedHeader("CoNtEnt-TyPE", "text/html"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type", "Text/plain"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("content-type", "tEXT/PLAIN"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("content-type", "text/html"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("CoNtEnt-TyPE", "text/html"));
- EXPECT_FALSE(IsCORSSafelistedHeader("content-type", "image/png"));
- EXPECT_FALSE(IsCORSSafelistedHeader("CoNtEnt-TyPE", "image/png"));
- EXPECT_TRUE(IsCORSSafelistedHeader(
+ EXPECT_FALSE(IsCorsSafelistedHeader("content-type", "image/png"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("CoNtEnt-TyPE", "image/png"));
+ EXPECT_TRUE(IsCorsSafelistedHeader(
"content-type", "text/plain; charset=" + std::string(108, 'a')));
- EXPECT_TRUE(IsCORSSafelistedHeader(
+ EXPECT_TRUE(IsCorsSafelistedHeader(
"cONTent-tYPE", "text/plain; charset=" + std::string(108, 'a')));
- EXPECT_FALSE(IsCORSSafelistedHeader(
+ EXPECT_FALSE(IsCorsSafelistedHeader(
"content-type", "text/plain; charset=" + std::string(109, 'a')));
- EXPECT_FALSE(IsCORSSafelistedHeader(
+ EXPECT_FALSE(IsCorsSafelistedHeader(
"cONTent-tYPE", "text/plain; charset=" + std::string(109, 'a')));
}
-TEST_F(CORSTest, CheckCORSClientHintsSafelist) {
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", ""));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "abc"));
- EXPECT_TRUE(IsCORSSafelistedHeader("device-memory", "1.25"));
- EXPECT_TRUE(IsCORSSafelistedHeader("DEVICE-memory", "1.25"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "1.25-2.5"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "-1.25"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "1e2"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "inf"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "-2.3"));
- EXPECT_FALSE(IsCORSSafelistedHeader("device-memory", "NaN"));
- EXPECT_FALSE(IsCORSSafelistedHeader("DEVICE-memory", "1.25.3"));
- EXPECT_FALSE(IsCORSSafelistedHeader("DEVICE-memory", "1."));
- EXPECT_FALSE(IsCORSSafelistedHeader("DEVICE-memory", ".1"));
- EXPECT_FALSE(IsCORSSafelistedHeader("DEVICE-memory", "."));
- EXPECT_TRUE(IsCORSSafelistedHeader("DEVICE-memory", "1"));
+TEST_F(CorsTest, CheckCorsClientHintsSafelist) {
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", ""));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "abc"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("device-memory", "1.25"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("DEVICE-memory", "1.25"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "1.25-2.5"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "-1.25"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "1e2"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "inf"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "-2.3"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("device-memory", "NaN"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("DEVICE-memory", "1.25.3"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("DEVICE-memory", "1."));
+ EXPECT_FALSE(IsCorsSafelistedHeader("DEVICE-memory", ".1"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("DEVICE-memory", "."));
+ EXPECT_TRUE(IsCorsSafelistedHeader("DEVICE-memory", "1"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", ""));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "abc"));
- EXPECT_TRUE(IsCORSSafelistedHeader("dpr", "1.25"));
- EXPECT_TRUE(IsCORSSafelistedHeader("Dpr", "1.25"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "1.25-2.5"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "-1.25"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "1e2"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "inf"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "-2.3"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "NaN"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "1.25.3"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "1."));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", ".1"));
- EXPECT_FALSE(IsCORSSafelistedHeader("dpr", "."));
- EXPECT_TRUE(IsCORSSafelistedHeader("dpr", "1"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", ""));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "abc"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("dpr", "1.25"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("Dpr", "1.25"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "1.25-2.5"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "-1.25"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "1e2"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "inf"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "-2.3"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "NaN"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "1.25.3"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "1."));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", ".1"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("dpr", "."));
+ EXPECT_TRUE(IsCorsSafelistedHeader("dpr", "1"));
- EXPECT_FALSE(IsCORSSafelistedHeader("width", ""));
- EXPECT_FALSE(IsCORSSafelistedHeader("width", "abc"));
- EXPECT_TRUE(IsCORSSafelistedHeader("width", "125"));
- EXPECT_TRUE(IsCORSSafelistedHeader("width", "1"));
- EXPECT_TRUE(IsCORSSafelistedHeader("WIDTH", "125"));
- EXPECT_FALSE(IsCORSSafelistedHeader("width", "125.2"));
- EXPECT_FALSE(IsCORSSafelistedHeader("width", "-125"));
- EXPECT_TRUE(IsCORSSafelistedHeader("width", "2147483648"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("width", ""));
+ EXPECT_FALSE(IsCorsSafelistedHeader("width", "abc"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("width", "125"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("width", "1"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("WIDTH", "125"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("width", "125.2"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("width", "-125"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("width", "2147483648"));
- EXPECT_FALSE(IsCORSSafelistedHeader("viewport-width", ""));
- EXPECT_FALSE(IsCORSSafelistedHeader("viewport-width", "abc"));
- EXPECT_TRUE(IsCORSSafelistedHeader("viewport-width", "125"));
- EXPECT_TRUE(IsCORSSafelistedHeader("viewport-width", "1"));
- EXPECT_TRUE(IsCORSSafelistedHeader("viewport-Width", "125"));
- EXPECT_FALSE(IsCORSSafelistedHeader("viewport-width", "125.2"));
- EXPECT_TRUE(IsCORSSafelistedHeader("viewport-width", "2147483648"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("viewport-width", ""));
+ EXPECT_FALSE(IsCorsSafelistedHeader("viewport-width", "abc"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("viewport-width", "125"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("viewport-width", "1"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("viewport-Width", "125"));
+ EXPECT_FALSE(IsCorsSafelistedHeader("viewport-width", "125.2"));
+ EXPECT_TRUE(IsCorsSafelistedHeader("viewport-width", "2147483648"));
}
-TEST_F(CORSTest, CORSUnsafeRequestHeaderNames) {
+TEST_F(CorsTest, CorsUnsafeRequestHeaderNames) {
// Needed because initializer list is not allowed for a macro argument.
using List = std::vector<std::string>;
// Empty => Empty
- EXPECT_EQ(CORSUnsafeRequestHeaderNames({}), List({}));
+ EXPECT_EQ(CorsUnsafeRequestHeaderNames({}), List({}));
// Some headers are safelisted.
- EXPECT_EQ(CORSUnsafeRequestHeaderNames({{"content-type", "text/plain"},
+ EXPECT_EQ(CorsUnsafeRequestHeaderNames({{"content-type", "text/plain"},
{"dpr", "12345"},
{"aCCept", "en,ja"},
{"accept-charset", "utf-8"},
@@ -596,7 +596,7 @@
// All headers are not safelisted.
EXPECT_EQ(
- CORSUnsafeRequestHeaderNames({{"content-type", "text/html"},
+ CorsUnsafeRequestHeaderNames({{"content-type", "text/html"},
{"dpr", "123-45"},
{"aCCept", "en,ja"},
{"accept-charset", "utf-8"},
@@ -606,7 +606,7 @@
// |safelistValueSize| is 1024.
EXPECT_EQ(
- CORSUnsafeRequestHeaderNames(
+ CorsUnsafeRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(108, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -621,7 +621,7 @@
// |safelistValueSize| is 1025.
EXPECT_EQ(
- CORSUnsafeRequestHeaderNames(
+ CorsUnsafeRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(108, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -638,7 +638,7 @@
// |safelistValueSize| is 897 because "content-type" is not safelisted.
EXPECT_EQ(
- CORSUnsafeRequestHeaderNames(
+ CorsUnsafeRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(128, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -652,18 +652,18 @@
List({"content-type", "hoge"}));
}
-TEST_F(CORSTest, CORSUnsafeNotForbiddenRequestHeaderNames) {
+TEST_F(CorsTest, CorsUnsafeNotForbiddenRequestHeaderNames) {
// Needed because initializer list is not allowed for a macro argument.
using List = std::vector<std::string>;
// Empty => Empty
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({}, false /* is_revalidating */),
+ CorsUnsafeNotForbiddenRequestHeaderNames({}, false /* is_revalidating */),
List({}));
// "user-agent" is NOT forbidden per spec, but forbidden in Chromium.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({{"content-type", "text/plain"},
+ CorsUnsafeNotForbiddenRequestHeaderNames({{"content-type", "text/plain"},
{"dpr", "12345"},
{"aCCept", "en,ja"},
{"accept-charset", "utf-8"},
@@ -673,7 +673,7 @@
List({"hoge"}));
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({{"content-type", "text/html"},
+ CorsUnsafeNotForbiddenRequestHeaderNames({{"content-type", "text/html"},
{"dpr", "123-45"},
{"aCCept", "en,ja"},
{"accept-charset", "utf-8"},
@@ -683,7 +683,7 @@
// |safelistValueSize| is 1024.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames(
+ CorsUnsafeNotForbiddenRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(108, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -700,7 +700,7 @@
// |safelistValueSize| is 1025.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames(
+ CorsUnsafeNotForbiddenRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(108, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -719,7 +719,7 @@
// |safelistValueSize| is 897 because "content-type" is not safelisted.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames(
+ CorsUnsafeNotForbiddenRequestHeaderNames(
{{"content-type", "text/plain; charset=" + std::string(128, '1')},
{"accept", std::string(128, '1')},
{"accept-language", std::string(128, '1')},
@@ -735,18 +735,18 @@
List({"content-type", "hoge"}));
}
-TEST_F(CORSTest, CORSUnsafeNotForbiddenRequestHeaderNamesWithRevalidating) {
+TEST_F(CorsTest, CorsUnsafeNotForbiddenRequestHeaderNamesWithRevalidating) {
// Needed because initializer list is not allowed for a macro argument.
using List = std::vector<std::string>;
// Empty => Empty
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({}, true /* is_revalidating */),
+ CorsUnsafeNotForbiddenRequestHeaderNames({}, true /* is_revalidating */),
List({}));
// These three headers will be ignored.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({{"If-MODifIED-since", "x"},
+ CorsUnsafeNotForbiddenRequestHeaderNames({{"If-MODifIED-since", "x"},
{"iF-nONE-MATCh", "y"},
{"CACHE-ContrOl", "z"}},
true /* is_revalidating */),
@@ -754,7 +754,7 @@
// Without is_revalidating set, these three headers will not be safelisted.
EXPECT_EQ(
- CORSUnsafeNotForbiddenRequestHeaderNames({{"If-MODifIED-since", "x"},
+ CorsUnsafeNotForbiddenRequestHeaderNames({{"If-MODifIED-since", "x"},
{"iF-nONE-MATCh", "y"},
{"CACHE-ContrOl", "z"}},
false /* is_revalidating */),
diff --git a/services/network/public/cpp/cors/origin_access_entry.cc b/services/network/public/cpp/cors/origin_access_entry.cc
index 26361e4..431d6ed7 100644
--- a/services/network/public/cpp/cors/origin_access_entry.cc
+++ b/services/network/public/cpp/cors/origin_access_entry.cc
@@ -34,7 +34,7 @@
const std::string& protocol,
const std::string& host,
MatchMode match_mode,
- const network::mojom::CORSOriginAccessMatchPriority priority)
+ const network::mojom::CorsOriginAccessMatchPriority priority)
: protocol_(protocol),
host_(host),
match_mode_(match_mode),
diff --git a/services/network/public/cpp/cors/origin_access_entry.h b/services/network/public/cpp/cors/origin_access_entry.h
index 5052f1a..0cc1365 100644
--- a/services/network/public/cpp/cors/origin_access_entry.h
+++ b/services/network/public/cpp/cors/origin_access_entry.h
@@ -53,8 +53,8 @@
const std::string& protocol,
const std::string& host,
MatchMode match_mode,
- const network::mojom::CORSOriginAccessMatchPriority priority =
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ const network::mojom::CorsOriginAccessMatchPriority priority =
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
OriginAccessEntry(OriginAccessEntry&& from);
// 'matchesOrigin' requires a protocol match (e.g. 'http' != 'https').
@@ -63,7 +63,7 @@
MatchResult MatchesDomain(const url::Origin& domain) const;
bool host_is_ip_address() const { return host_is_ip_address_; }
- network::mojom::CORSOriginAccessMatchPriority priority() const {
+ network::mojom::CorsOriginAccessMatchPriority priority() const {
return priority_;
}
const std::string& registerable_domain() const {
@@ -74,7 +74,7 @@
const std::string protocol_;
const std::string host_;
const MatchMode match_mode_;
- network::mojom::CORSOriginAccessMatchPriority priority_;
+ network::mojom::CorsOriginAccessMatchPriority priority_;
const bool host_is_ip_address_;
std::string registerable_domain_;
diff --git a/services/network/public/cpp/cors/origin_access_entry_unittest.cc b/services/network/public/cpp/cors/origin_access_entry_unittest.cc
index a68e978..3621f61 100644
--- a/services/network/public/cpp/cors/origin_access_entry_unittest.cc
+++ b/services/network/public/cpp/cors/origin_access_entry_unittest.cc
@@ -19,13 +19,13 @@
url::Origin origin = url::Origin::Create(GURL("http://www.google.com"));
OriginAccessEntry entry1(
"http", "google.com", OriginAccessEntry::kAllowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
OriginAccessEntry entry2(
"http", "hamster.com", OriginAccessEntry::kAllowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
OriginAccessEntry entry3(
"http", "com", OriginAccessEntry::kAllowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(OriginAccessEntry::kMatchesOrigin, entry1.MatchesOrigin(origin));
EXPECT_EQ(OriginAccessEntry::kDoesNotMatchOrigin,
entry2.MatchesOrigin(origin));
@@ -93,7 +93,7 @@
url::Origin origin_to_test = url::Origin::Create(GURL(test.origin));
OriginAccessEntry entry1(
test.protocol, test.host, OriginAccessEntry::kAllowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(test.expected_origin, entry1.MatchesOrigin(origin_to_test));
EXPECT_EQ(test.expected_domain, entry1.MatchesDomain(origin_to_test));
}
@@ -142,7 +142,7 @@
url::Origin origin_to_test = url::Origin::Create(GURL(test.origin));
OriginAccessEntry entry1(
test.protocol, test.host, OriginAccessEntry::kAllowRegisterableDomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SCOPED_TRACE(testing::Message()
<< "Host: " << test.host << ", Origin: " << test.origin
@@ -195,7 +195,7 @@
url::Origin origin_to_test = url::Origin::Create(GURL(test.origin));
OriginAccessEntry entry1(
test.protocol, test.host, OriginAccessEntry::kAllowRegisterableDomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SCOPED_TRACE(testing::Message()
<< "Host: " << test.host << ", Origin: " << test.origin
@@ -245,7 +245,7 @@
url::Origin origin_to_test = url::Origin::Create(GURL(test.origin));
OriginAccessEntry entry1(
test.protocol, test.host, OriginAccessEntry::kDisallowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(test.expected, entry1.MatchesOrigin(origin_to_test));
}
}
@@ -271,7 +271,7 @@
SCOPED_TRACE(testing::Message() << "Host: " << test.host);
OriginAccessEntry entry(
test.protocol, test.host, OriginAccessEntry::kDisallowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(test.is_ip_address, entry.host_is_ip_address()) << test.host;
}
}
@@ -299,12 +299,12 @@
url::Origin origin_to_test = url::Origin::Create(GURL(test.origin));
OriginAccessEntry entry1(
test.protocol, test.host, OriginAccessEntry::kAllowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(test.expected, entry1.MatchesOrigin(origin_to_test));
OriginAccessEntry entry2(
test.protocol, test.host, OriginAccessEntry::kDisallowSubdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_EQ(test.expected, entry2.MatchesOrigin(origin_to_test));
}
}
diff --git a/services/network/public/cpp/cors/origin_access_list.cc b/services/network/public/cpp/cors/origin_access_list.cc
index 61ff535..1ab91ff 100644
--- a/services/network/public/cpp/cors/origin_access_list.cc
+++ b/services/network/public/cpp/cors/origin_access_list.cc
@@ -49,17 +49,17 @@
return false;
std::string source = source_origin.Serialize();
url::Origin destination_origin = url::Origin::Create(destination);
- network::mojom::CORSOriginAccessMatchPriority allow_list_priority =
+ network::mojom::CorsOriginAccessMatchPriority allow_list_priority =
GetHighestPriorityOfRuleForOrigin(source, destination_origin,
allow_list_);
if (allow_list_priority ==
- network::mojom::CORSOriginAccessMatchPriority::kNoMatchingOrigin)
+ network::mojom::CorsOriginAccessMatchPriority::kNoMatchingOrigin)
return false;
- network::mojom::CORSOriginAccessMatchPriority block_list_priority =
+ network::mojom::CorsOriginAccessMatchPriority block_list_priority =
GetHighestPriorityOfRuleForOrigin(source, destination_origin,
block_list_);
if (block_list_priority ==
- network::mojom::CORSOriginAccessMatchPriority::kNoMatchingOrigin)
+ network::mojom::CorsOriginAccessMatchPriority::kNoMatchingOrigin)
return true;
return allow_list_priority > block_list_priority;
}
@@ -105,13 +105,13 @@
// static
// TODO(nrpeter): Sort OriginAccessEntry entries on edit then we can return the
// first match which will be the top priority.
-network::mojom::CORSOriginAccessMatchPriority
+network::mojom::CorsOriginAccessMatchPriority
OriginAccessList::GetHighestPriorityOfRuleForOrigin(
const std::string& source,
const url::Origin& destination_origin,
const PatternMap& map) {
- network::mojom::CORSOriginAccessMatchPriority highest_priority =
- network::mojom::CORSOriginAccessMatchPriority::kNoMatchingOrigin;
+ network::mojom::CorsOriginAccessMatchPriority highest_priority =
+ network::mojom::CorsOriginAccessMatchPriority::kNoMatchingOrigin;
auto patterns_for_origin_it = map.find(source);
if (patterns_for_origin_it == map.end())
return highest_priority;
diff --git a/services/network/public/cpp/cors/origin_access_list.h b/services/network/public/cpp/cors/origin_access_list.h
index 35a7d50..dac77504 100644
--- a/services/network/public/cpp/cors/origin_access_list.h
+++ b/services/network/public/cpp/cors/origin_access_list.h
@@ -70,7 +70,7 @@
static void AddForOrigin(const url::Origin& source_origin,
const mojom::CorsOriginPatternPtr& pattern,
PatternMap* map);
- static network::mojom::CORSOriginAccessMatchPriority
+ static network::mojom::CorsOriginAccessMatchPriority
GetHighestPriorityOfRuleForOrigin(const std::string& source,
const url::Origin& destination_origin,
const PatternMap& map);
diff --git a/services/network/public/cpp/cors/origin_access_list_unittest.cc b/services/network/public/cpp/cors/origin_access_list_unittest.cc
index d8a00800..16dcfaa 100644
--- a/services/network/public/cpp/cors/origin_access_list_unittest.cc
+++ b/services/network/public/cpp/cors/origin_access_list_unittest.cc
@@ -53,14 +53,14 @@
std::vector<mojom::CorsOriginPatternPtr> patterns;
patterns.push_back(mojom::CorsOriginPattern::New(
protocol, host, allow_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
list_.SetAllowListForOrigin(source_origin_, patterns);
}
void AddAllowListEntry(
const std::string& protocol,
const std::string& host,
bool allow_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
list_.AddAllowListEntryForOrigin(
source_origin_, network::mojom::CorsOriginPattern::New(
protocol, host, allow_subdomains, priority));
@@ -71,14 +71,14 @@
std::vector<mojom::CorsOriginPatternPtr> patterns;
patterns.push_back(mojom::CorsOriginPattern::New(
protocol, host, allow_subdomains,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority));
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority));
list_.SetBlockListForOrigin(source_origin_, patterns);
}
void AddBlockListEntry(
const std::string& protocol,
const std::string& host,
bool allow_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
list_.AddBlockListEntryForOrigin(
source_origin_, network::mojom::CorsOriginPattern::New(
protocol, host, allow_subdomains, priority));
@@ -125,7 +125,7 @@
// subdomains.
AddAllowListEntry(
"https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_TRUE(IsAllowed(https_sub_example_origin()));
EXPECT_FALSE(IsAllowed(http_example_origin()));
@@ -152,7 +152,7 @@
SetAllowListEntry("https", "", true);
AddBlockListEntry(
"https", "google.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_google_origin()));
@@ -166,14 +166,14 @@
// Higher priority blocklist overrides lower priority allowlist.
AddBlockListEntry(
"https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
EXPECT_FALSE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_sub_example_origin()));
// Higher priority allowlist overrides lower priority blocklist.
AddAllowListEntry(
"https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_sub_example_origin()));
}
@@ -181,19 +181,19 @@
TEST_F(OriginAccessListTest, IsPriorityRespectedReverse) {
AddAllowListEntry(
"https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_sub_example_origin()));
AddBlockListEntry(
"https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_sub_example_origin()));
AddAllowListEntry(
"https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(IsAllowed(https_example_origin()));
EXPECT_FALSE(IsAllowed(https_sub_example_origin()));
}
diff --git a/services/network/public/cpp/cors/preflight_result.cc b/services/network/public/cpp/cors/preflight_result.cc
index a26a8b7..c07e0fab 100644
--- a/services/network/public/cpp/cors/preflight_result.cc
+++ b/services/network/public/cpp/cors/preflight_result.cc
@@ -93,10 +93,10 @@
const base::Optional<std::string>& allow_methods_header,
const base::Optional<std::string>& allow_headers_header,
const base::Optional<std::string>& max_age_header,
- base::Optional<mojom::CORSError>* detected_error) {
+ base::Optional<mojom::CorsError>* detected_error) {
std::unique_ptr<PreflightResult> result =
base::WrapUnique(new PreflightResult(credentials_mode));
- base::Optional<mojom::CORSError> error =
+ base::Optional<mojom::CorsError> error =
result->Parse(allow_methods_header, allow_headers_header, max_age_header);
if (error) {
if (detected_error)
@@ -112,25 +112,25 @@
PreflightResult::~PreflightResult() = default;
-base::Optional<CORSErrorStatus> PreflightResult::EnsureAllowedCrossOriginMethod(
+base::Optional<CorsErrorStatus> PreflightResult::EnsureAllowedCrossOriginMethod(
const std::string& method) const {
// Request method is normalized to upper case, and comparison is performed in
// case-sensitive way, that means access control header should provide an
// upper case method list.
const std::string normalized_method = base::ToUpperASCII(method);
if (methods_.find(normalized_method) != methods_.end() ||
- IsCORSSafelistedMethod(normalized_method)) {
+ IsCorsSafelistedMethod(normalized_method)) {
return base::nullopt;
}
if (!credentials_ && methods_.find("*") != methods_.end())
return base::nullopt;
- return CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ return CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
method);
}
-base::Optional<CORSErrorStatus>
+base::Optional<CorsErrorStatus>
PreflightResult::EnsureAllowedCrossOriginHeaders(
const net::HttpRequestHeaders& headers,
bool is_revalidating) const {
@@ -140,14 +140,14 @@
// Forbidden headers are forbidden to be used by JavaScript, and checked
// beforehand. But user-agents may add these headers internally, and it's
// fine.
- for (const auto& name : CORSUnsafeNotForbiddenRequestHeaderNames(
+ for (const auto& name : CorsUnsafeNotForbiddenRequestHeaderNames(
headers.GetHeaderVector(), is_revalidating)) {
// Header list check is performed in case-insensitive way. Here, we have a
// parsed header list set in lower case, and search each header in lower
// case.
if (headers_.find(name) == headers_.end()) {
- return CORSErrorStatus(
- mojom::CORSError::kHeaderDisallowedByPreflightResponse, name);
+ return CorsErrorStatus(
+ mojom::CorsError::kHeaderDisallowedByPreflightResponse, name);
}
}
return base::nullopt;
@@ -175,7 +175,7 @@
return true;
}
-base::Optional<mojom::CORSError> PreflightResult::Parse(
+base::Optional<mojom::CorsError> PreflightResult::Parse(
const base::Optional<std::string>& allow_methods_header,
const base::Optional<std::string>& allow_headers_header,
const base::Optional<std::string>& max_age_header) {
@@ -184,11 +184,11 @@
// Keeps parsed method case for case-sensitive search.
if (!ParseAccessControlAllowList(allow_methods_header, &methods_, false))
- return mojom::CORSError::kInvalidAllowMethodsPreflightResponse;
+ return mojom::CorsError::kInvalidAllowMethodsPreflightResponse;
// Holds parsed headers in lower case for case-insensitive search.
if (!ParseAccessControlAllowList(allow_headers_header, &headers_, true))
- return mojom::CORSError::kInvalidAllowHeadersPreflightResponse;
+ return mojom::CorsError::kInvalidAllowHeadersPreflightResponse;
base::TimeDelta expiry_delta;
if (max_age_header) {
diff --git a/services/network/public/cpp/cors/preflight_result.h b/services/network/public/cpp/cors/preflight_result.h
index 0df888a8..53c8663 100644
--- a/services/network/public/cpp/cors/preflight_result.h
+++ b/services/network/public/cpp/cors/preflight_result.h
@@ -42,11 +42,11 @@
const base::Optional<std::string>& allow_methods_header,
const base::Optional<std::string>& allow_headers_header,
const base::Optional<std::string>& max_age_header,
- base::Optional<mojom::CORSError>* detected_error);
+ base::Optional<mojom::CorsError>* detected_error);
~PreflightResult();
// Checks if the given |method| is allowed by the CORS-preflight response.
- base::Optional<CORSErrorStatus> EnsureAllowedCrossOriginMethod(
+ base::Optional<CorsErrorStatus> EnsureAllowedCrossOriginMethod(
const std::string& method) const;
// Checks if the given all |headers| are allowed by the CORS-preflight
@@ -55,7 +55,7 @@
// (https://fetch.spec.whatwg.org/#forbidden-header-name) because they may be
// added by the user agent. They must be checked separately and rejected for
// JavaScript-initiated requests.
- base::Optional<CORSErrorStatus> EnsureAllowedCrossOriginHeaders(
+ base::Optional<CorsErrorStatus> EnsureAllowedCrossOriginHeaders(
const net::HttpRequestHeaders& headers,
bool is_revalidating) const;
@@ -74,7 +74,7 @@
protected:
explicit PreflightResult(const mojom::FetchCredentialsMode credentials_mode);
- base::Optional<mojom::CORSError> Parse(
+ base::Optional<mojom::CorsError> Parse(
const base::Optional<std::string>& allow_methods_header,
const base::Optional<std::string>& allow_headers_header,
const base::Optional<std::string>& max_age_header);
diff --git a/services/network/public/cpp/cors/preflight_result_unittest.cc b/services/network/public/cpp/cors/preflight_result_unittest.cc
index d1a709c..61bf6037 100644
--- a/services/network/public/cpp/cors/preflight_result_unittest.cc
+++ b/services/network/public/cpp/cors/preflight_result_unittest.cc
@@ -26,7 +26,7 @@
const std::string request_headers;
const mojom::FetchCredentialsMode request_credentials_mode;
- const base::Optional<CORSErrorStatus> expected_result;
+ const base::Optional<CorsErrorStatus> expected_result;
};
const TestCase method_cases[] = {
@@ -67,23 +67,23 @@
// Not found in the preflight response and the safe lit.
{"", "", mojom::FetchCredentialsMode::kOmit, "OPTIONS", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"OPTIONS")},
{"", "", mojom::FetchCredentialsMode::kOmit, "PUT", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"PUT")},
{"", "", mojom::FetchCredentialsMode::kOmit, "DELETE", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"DELETE")},
{"GET", "", mojom::FetchCredentialsMode::kOmit, "PUT", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"PUT")},
{"GET, POST, DELETE", "", mojom::FetchCredentialsMode::kOmit, "PUT", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"PUT")},
// Request method is normalized to upper-case, but allowed methods is not.
@@ -91,11 +91,11 @@
// upper case.
{"put", "", mojom::FetchCredentialsMode::kOmit, "PUT", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"PUT")},
{"put", "", mojom::FetchCredentialsMode::kOmit, "put", "",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kMethodDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kMethodDisallowedByPreflightResponse,
"put")},
{"PUT", "", mojom::FetchCredentialsMode::kOmit, "put", "",
mojom::FetchCredentialsMode::kOmit, base::nullopt},
@@ -124,7 +124,7 @@
mojom::FetchCredentialsMode::kOmit, base::nullopt},
{"GET", "*", mojom::FetchCredentialsMode::kInclude, "GET", "xyzzy:t",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kHeaderDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kHeaderDisallowedByPreflightResponse,
"xyzzy")},
// Forbidden headers can pass.
@@ -134,15 +134,15 @@
// Not found in the preflight response and the safe list.
{"GET", "", mojom::FetchCredentialsMode::kOmit, "GET", "X-MY-HEADER:t",
mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kHeaderDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kHeaderDisallowedByPreflightResponse,
"x-my-header")},
{"GET", "X-SOME-OTHER-HEADER", mojom::FetchCredentialsMode::kOmit, "GET",
"X-MY-HEADER:t", mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kHeaderDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kHeaderDisallowedByPreflightResponse,
"x-my-header")},
{"GET", "X-MY-HEADER", mojom::FetchCredentialsMode::kOmit, "GET",
"X-MY-HEADER:t\r\nY-MY-HEADER:t", mojom::FetchCredentialsMode::kOmit,
- CORSErrorStatus(mojom::CORSError::kHeaderDisallowedByPreflightResponse,
+ CorsErrorStatus(mojom::CorsError::kHeaderDisallowedByPreflightResponse,
"y-my-header")},
};
diff --git a/services/network/public/cpp/cors_error_status.typemap b/services/network/public/cpp/cors_error_status.typemap
index 89e83ff..f7b4575 100644
--- a/services/network/public/cpp/cors_error_status.typemap
+++ b/services/network/public/cpp/cors_error_status.typemap
@@ -11,4 +11,4 @@
public_deps = [
"//services/network/public/cpp:cpp_base",
]
-type_mappings = [ "network.mojom.CORSErrorStatus=network::CORSErrorStatus" ]
+type_mappings = [ "network.mojom.CorsErrorStatus=network::CorsErrorStatus" ]
diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
index 6230a08..de0469f 100644
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -19,7 +19,7 @@
base::FEATURE_DISABLED_BY_DEFAULT};
// Out of Blink CORS
-const base::Feature kOutOfBlinkCORS{"OutOfBlinkCORS",
+const base::Feature kOutOfBlinkCors{"OutOfBlinkCORS",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
index 61594f17..c76bc52 100644
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
@@ -18,7 +18,7 @@
COMPONENT_EXPORT(NETWORK_CPP)
extern const base::Feature kNetworkService;
COMPONENT_EXPORT(NETWORK_CPP)
-extern const base::Feature kOutOfBlinkCORS;
+extern const base::Feature kOutOfBlinkCors;
COMPONENT_EXPORT(NETWORK_CPP)
extern const base::Feature kReporting;
COMPONENT_EXPORT(NETWORK_CPP)
diff --git a/services/network/public/cpp/network_ipc_param_traits.h b/services/network/public/cpp/network_ipc_param_traits.h
index 30571ad..88fc901 100644
--- a/services/network/public/cpp/network_ipc_param_traits.h
+++ b/services/network/public/cpp/network_ipc_param_traits.h
@@ -89,8 +89,8 @@
#endif // INTERNAL_SERVICES_NETWORK_PUBLIC_CPP_NETWORK_IPC_PARAM_TRAITS_H_
-IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::CORSError,
- network::mojom::CORSError::kMaxValue)
+IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::CorsError,
+ network::mojom::CorsError::kMaxValue)
IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::FetchCredentialsMode,
network::mojom::FetchCredentialsMode::kMaxValue)
@@ -104,10 +104,10 @@
IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::RequestContextFrameType,
network::mojom::RequestContextFrameType::kMaxValue)
-IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::CORSPreflightPolicy,
- network::mojom::CORSPreflightPolicy::kMaxValue)
+IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::CorsPreflightPolicy,
+ network::mojom::CorsPreflightPolicy::kMaxValue)
-IPC_STRUCT_TRAITS_BEGIN(network::CORSErrorStatus)
+IPC_STRUCT_TRAITS_BEGIN(network::CorsErrorStatus)
IPC_STRUCT_TRAITS_MEMBER(cors_error)
IPC_STRUCT_TRAITS_MEMBER(failed_parameter)
IPC_STRUCT_TRAITS_END()
diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
index 36b14d3..831be44 100644
--- a/services/network/public/cpp/resource_request.h
+++ b/services/network/public/cpp/resource_request.h
@@ -116,8 +116,8 @@
bool is_external_request = false;
// A policy to decide if CORS-preflight fetch should be performed.
- mojom::CORSPreflightPolicy cors_preflight_policy =
- mojom::CORSPreflightPolicy::kConsiderPreflight;
+ mojom::CorsPreflightPolicy cors_preflight_policy =
+ mojom::CorsPreflightPolicy::kConsiderPreflight;
// Indicates which frame (or worker context) the request is being loaded into.
// -1 corresponds to kInvalidServiceWorkerProviderId.
@@ -138,9 +138,9 @@
// https://fetch.spec.whatwg.org/#concept-request-mode
// Used mainly by CORS handling (out-of-blink CORS), CORB, Service Worker.
// CORS handling needs a proper origin (including a unique opaque origin).
- // Hence a request with kSameOrigin, kCORS, or kCORSWithForcedPreflight should
+ // Hence a request with kSameOrigin, kCors, or kCorsWithForcedPreflight should
// have a non-null request_initiator.
- mojom::FetchRequestMode fetch_request_mode = mojom::FetchRequestMode::kNoCORS;
+ mojom::FetchRequestMode fetch_request_mode = mojom::FetchRequestMode::kNoCors;
// https://fetch.spec.whatwg.org/#concept-request-credentials-mode
// Used mainly by CORS handling (out-of-blink CORS), Service Worker.
@@ -151,7 +151,7 @@
// https://fetch.spec.whatwg.org/#concept-request-redirect-mode
// Used mainly by CORS handling (out-of-blink CORS), Service Worker.
- // This member must be kFollow as long as |fetch_request_mode| is kNoCORS.
+ // This member must be kFollow as long as |fetch_request_mode| is kNoCors.
mojom::FetchRedirectMode fetch_redirect_mode =
mojom::FetchRedirectMode::kFollow;
diff --git a/services/network/public/cpp/url_loader_completion_status.cc b/services/network/public/cpp/url_loader_completion_status.cc
index 4a6d60d..7cfe6e1af 100644
--- a/services/network/public/cpp/url_loader_completion_status.cc
+++ b/services/network/public/cpp/url_loader_completion_status.cc
@@ -16,7 +16,7 @@
: error_code(error_code), completion_time(base::TimeTicks::Now()) {}
URLLoaderCompletionStatus::URLLoaderCompletionStatus(
- const CORSErrorStatus& error)
+ const CorsErrorStatus& error)
: URLLoaderCompletionStatus(net::ERR_FAILED) {
cors_error_status = error;
}
diff --git a/services/network/public/cpp/url_loader_completion_status.h b/services/network/public/cpp/url_loader_completion_status.h
index 6e243cb..6ca5b23 100644
--- a/services/network/public/cpp/url_loader_completion_status.h
+++ b/services/network/public/cpp/url_loader_completion_status.h
@@ -31,7 +31,7 @@
// Sets ERR_FAILED to |error_code|, |error| to |cors_error_status|, and
// base::TimeTicks::Now() to |completion_time|.
- explicit URLLoaderCompletionStatus(const CORSErrorStatus& error);
+ explicit URLLoaderCompletionStatus(const CorsErrorStatus& error);
~URLLoaderCompletionStatus();
@@ -62,7 +62,7 @@
int64_t decoded_body_length = 0;
// Optional CORS error details.
- base::Optional<CORSErrorStatus> cors_error_status;
+ base::Optional<CorsErrorStatus> cors_error_status;
// Optional SSL certificate info.
base::Optional<net::SSLInfo> ssl_info;
diff --git a/services/network/public/mojom/cors.mojom b/services/network/public/mojom/cors.mojom
index 5199351..2f14aa6 100644
--- a/services/network/public/mojom/cors.mojom
+++ b/services/network/public/mojom/cors.mojom
@@ -4,16 +4,14 @@
module network.mojom;
-// TODO(crbug.com/875759): Rename to Cors* rather than CORS*.
-
// A policy to decide if CORS-preflight fetch should be performed.
-enum CORSPreflightPolicy {
+enum CorsPreflightPolicy {
kConsiderPreflight,
kPreventPreflight,
};
// Error conditions of the CORS check.
-enum CORSError {
+enum CorsError {
// Access control
kDisallowedByMode,
kInvalidResponse,
@@ -40,7 +38,7 @@
kInvalidAllowCredentials,
// The scheme is not for CORS.
- kCORSDisabledScheme,
+ kCorsDisabledScheme,
// Preflight:
// Failed to check HTTP response ok status in a CORS-preflight response.
@@ -97,7 +95,7 @@
};
// Determine which Cors exception takes precedence when multiple matches occur.
-enum CORSOriginAccessMatchPriority {
+enum CorsOriginAccessMatchPriority {
kNoMatchingOrigin,
kDefaultPriority,
kLowPriority,
diff --git a/services/network/public/mojom/cors_origin_pattern.mojom b/services/network/public/mojom/cors_origin_pattern.mojom
index a00e97cff..b79637b1 100644
--- a/services/network/public/mojom/cors_origin_pattern.mojom
+++ b/services/network/public/mojom/cors_origin_pattern.mojom
@@ -21,5 +21,5 @@
// patterns take precedence over lower ones. In the case were both a
// allow list and block list rule of the same priority match a request,
// the block list rule takes priority.
- CORSOriginAccessMatchPriority priority;
+ CorsOriginAccessMatchPriority priority;
};
diff --git a/services/network/public/mojom/fetch_api.mojom b/services/network/public/mojom/fetch_api.mojom
index 2cb441f..5daf7d05 100644
--- a/services/network/public/mojom/fetch_api.mojom
+++ b/services/network/public/mojom/fetch_api.mojom
@@ -11,9 +11,9 @@
// See the "FetchRequestMode" enum in enums.xml.
enum FetchRequestMode {
kSameOrigin,
- kNoCORS,
- kCORS,
- kCORSWithForcedPreflight,
+ kNoCors,
+ kCors,
+ kCorsWithForcedPreflight,
kNavigate,
// Add a new type here, then update enums.xml.
};
@@ -41,7 +41,7 @@
// See the "FetchResponseType" enum in enums.xml.
enum FetchResponseType {
kBasic,
- kCORS,
+ kCors,
kDefault,
kError,
kOpaque,
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index f5dc542b..339fed5 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -340,7 +340,7 @@
int32 corb_detachable_resource_type = -1;
// TODO(lukasza): https://crbug.com/846339: Remove the field below and instead
// make plugins use a separate URLoaderFactory. Note requests of this type are
- // only excluded if ResourceRequest::fetch_request_mode is kNoCORS. The field
+ // only excluded if ResourceRequest::fetch_request_mode is kNoCors. The field
// below in practice is always set to RESOURCE_TYPE_PLUGIN_RESOURCE by the
// content layer, but in the long-term we want to avoid using resource types
// (even as an opaque int) in //services/network. See also the TODO comment
diff --git a/services/network/public/mojom/url_loader.mojom b/services/network/public/mojom/url_loader.mojom
index c17e5bdd5..c78759eb 100644
--- a/services/network/public/mojom/url_loader.mojom
+++ b/services/network/public/mojom/url_loader.mojom
@@ -17,7 +17,7 @@
struct URLRequestRedirectInfo;
[Native]
-struct CORSErrorStatus;
+struct CorsErrorStatus;
[Native]
struct URLLoaderCompletionStatus;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 4047cf2d..1b266fb 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -376,7 +376,7 @@
is_nocors_corb_excluded_request_ =
resource_type_ == factory_params_->corb_excluded_resource_type &&
- request.fetch_request_mode == mojom::FetchRequestMode::kNoCORS &&
+ request.fetch_request_mode == mojom::FetchRequestMode::kNoCors &&
CrossOriginReadBlocking::ShouldAllowForPlugin(
factory_params_->process_id);
diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
index da6f7ef..87eb97b 100644
--- a/services/network/url_loader_factory.cc
+++ b/services/network/url_loader_factory.cc
@@ -31,7 +31,7 @@
NetworkContext* context,
mojom::URLLoaderFactoryParamsPtr params,
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
- cors::CORSURLLoaderFactory* cors_url_loader_factory)
+ cors::CorsURLLoaderFactory* cors_url_loader_factory)
: context_(context),
params_(std::move(params)),
resource_scheduler_client_(std::move(resource_scheduler_client)),
@@ -140,7 +140,7 @@
auto loader = std::make_unique<URLLoader>(
context_->url_request_context(), network_service_client,
- base::BindOnce(&cors::CORSURLLoaderFactory::DestroyURLLoader,
+ base::BindOnce(&cors::CorsURLLoaderFactory::DestroyURLLoader,
base::Unretained(cors_url_loader_factory_)),
std::move(request), options, url_request, report_raw_headers,
std::move(client),
diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
index 7031e60..ede3a47 100644
--- a/services/network/url_loader_factory.h
+++ b/services/network/url_loader_factory.h
@@ -21,7 +21,7 @@
class URLLoader;
namespace cors {
-class CORSURLLoaderFactory;
+class CorsURLLoaderFactory;
} // namespace cors
// This class is an implementation of mojom::URLLoaderFactory that
@@ -33,9 +33,9 @@
// works on each frame.
// A URLLoaderFactory can be created with null ResourceSchedulerClient, in which
// case requests constructed by the factory will not be throttled.
-// The CORS related part is implemented in CORSURLLoader[Factory] until
-// kOutOfBlinkCORS and kNetworkService is fully enabled. Note that
-// NetworkContext::CreateURLLoaderFactory returns a CORSURLLoaderFactory,
+// The CORS related part is implemented in CorsURLLoader[Factory] until
+// kOutOfBlinkCors and kNetworkService is fully enabled. Note that
+// NetworkContext::CreateURLLoaderFactory returns a CorsURLLoaderFactory,
// instead of a URLLoaderFactory.
class URLLoaderFactory : public mojom::URLLoaderFactory {
public:
@@ -44,7 +44,7 @@
NetworkContext* context,
mojom::URLLoaderFactoryParamsPtr params,
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
- cors::CORSURLLoaderFactory* cors_url_loader_factory);
+ cors::CorsURLLoaderFactory* cors_url_loader_factory);
~URLLoaderFactory() override;
@@ -70,7 +70,7 @@
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
// |cors_url_loader_factory_| owns this.
- cors::CORSURLLoaderFactory* cors_url_loader_factory_;
+ cors::CorsURLLoaderFactory* cors_url_loader_factory_;
DISALLOW_COPY_AND_ASSIGN(URLLoaderFactory);
};
diff --git a/services/network/url_loader_unittest.cc b/services/network/url_loader_unittest.cc
index 5fd4ee8..42906f4 100644
--- a/services/network/url_loader_unittest.cc
+++ b/services/network/url_loader_unittest.cc
@@ -2510,7 +2510,7 @@
ResourceRequest request =
CreateResourceRequest("GET", test_server()->GetURL("/hello.html"));
request.resource_type = kResourceType;
- request.fetch_request_mode = mojom::FetchRequestMode::kCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kCors;
request.request_initiator = url::Origin::Create(GURL("http://foo.com/"));
base::RunLoop delete_run_loop;
@@ -2546,7 +2546,7 @@
ResourceRequest request =
CreateResourceRequest("GET", test_server()->GetURL("/hello.html"));
request.resource_type = kResourceType;
- request.fetch_request_mode = mojom::FetchRequestMode::kNoCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kNoCors;
request.request_initiator = url::Origin::Create(GURL("http://foo.com/"));
base::RunLoop delete_run_loop;
@@ -2586,7 +2586,7 @@
ResourceRequest request =
CreateResourceRequest("GET", test_server()->GetURL("/hello.html"));
request.resource_type = kResourceType;
- request.fetch_request_mode = mojom::FetchRequestMode::kNoCORS;
+ request.fetch_request_mode = mojom::FetchRequestMode::kNoCors;
request.request_initiator = url::Origin::Create(GURL("http://foo.com/"));
base::RunLoop delete_run_loop;
diff --git a/third_party/blink/public/mojom/service_worker/service_worker_error_type.mojom b/third_party/blink/public/mojom/service_worker/service_worker_error_type.mojom
index d6fb066..9fe0fc9 100644
--- a/third_party/blink/public/mojom/service_worker/service_worker_error_type.mojom
+++ b/third_party/blink/public/mojom/service_worker/service_worker_error_type.mojom
@@ -45,7 +45,7 @@
// kForeignFetchMismatchedOrigin = 13, // obsolete
kRedirectedResponseForNotFollowRequest = 14,
kDataPipeCreationFailed = 15,
- kResponseTypeCORSForRequestModeSameOrigin = 16,
+ kResponseTypeCorsForRequestModeSameOrigin = 16,
kResponseBodyBroken = 17,
// Add a new type here, then update enums.xml.
};
diff --git a/third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom b/third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom
index e6a0ab0..66f9453 100644
--- a/third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom
+++ b/third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom
@@ -101,7 +101,7 @@
};
struct FetchAPIRequest {
- network.mojom.FetchRequestMode mode = network.mojom.FetchRequestMode.kNoCORS;
+ network.mojom.FetchRequestMode mode = network.mojom.FetchRequestMode.kNoCors;
bool is_main_resource_load = false;
RequestContextType request_context_type =
RequestContextType.UNSPECIFIED;
diff --git a/third_party/blink/public/platform/web_media_player.h b/third_party/blink/public/platform/web_media_player.h
index f515cdaf..f22b491 100644
--- a/third_party/blink/public/platform/web_media_player.h
+++ b/third_party/blink/public/platform/web_media_player.h
@@ -88,10 +88,10 @@
kPreloadAuto,
};
- enum CORSMode {
- kCORSModeUnspecified,
- kCORSModeAnonymous,
- kCORSModeUseCredentials,
+ enum CorsMode {
+ kCorsModeUnspecified,
+ kCorsModeAnonymous,
+ kCorsModeUseCredentials,
};
// Reported to UMA. Do not change existing values.
@@ -147,7 +147,7 @@
virtual ~WebMediaPlayer() = default;
- virtual LoadTiming Load(LoadType, const WebMediaPlayerSource&, CORSMode) = 0;
+ virtual LoadTiming Load(LoadType, const WebMediaPlayerSource&, CorsMode) = 0;
// Playback controls.
virtual void Play() = 0;
diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
index 047956d..c891a4c 100644
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -130,7 +130,7 @@
BLINK_PLATFORM_EXPORT static void EnableOrientationEvent(bool);
BLINK_PLATFORM_EXPORT static void EnableOverflowIconsForMediaControls(bool);
BLINK_PLATFORM_EXPORT static void EnableOverlayScrollbars(bool);
- BLINK_PLATFORM_EXPORT static void EnableOutOfBlinkCORS(bool);
+ BLINK_PLATFORM_EXPORT static void EnableOutOfBlinkCors(bool);
BLINK_PLATFORM_EXPORT static void EnablePageLifecycle(bool);
BLINK_PLATFORM_EXPORT static void EnablePagePopup(bool);
BLINK_PLATFORM_EXPORT static void EnablePassiveDocumentEventListeners(bool);
diff --git a/third_party/blink/public/platform/web_url_error.h b/third_party/blink/public/platform/web_url_error.h
index c2a176e56..43995b5 100644
--- a/third_party/blink/public/platform/web_url_error.h
+++ b/third_party/blink/public/platform/web_url_error.h
@@ -59,7 +59,7 @@
HasCopyInCache,
IsWebSecurityViolation,
const WebURL&);
- BLINK_PLATFORM_EXPORT WebURLError(const network::CORSErrorStatus&,
+ BLINK_PLATFORM_EXPORT WebURLError(const network::CorsErrorStatus&,
HasCopyInCache,
const WebURL&);
@@ -68,7 +68,7 @@
bool has_copy_in_cache() const { return has_copy_in_cache_; }
bool is_web_security_violation() const { return is_web_security_violation_; }
const WebURL& url() const { return url_; }
- const base::Optional<network::CORSErrorStatus> cors_error_status() const {
+ const base::Optional<network::CorsErrorStatus> cors_error_status() const {
return cors_error_status_;
}
@@ -91,7 +91,7 @@
WebURL url_;
// Optional CORS error details.
- base::Optional<network::CORSErrorStatus> cors_error_status_;
+ base::Optional<network::CorsErrorStatus> cors_error_status_;
};
} // namespace blink
diff --git a/third_party/blink/public/platform/web_url_request.h b/third_party/blink/public/platform/web_url_request.h
index 33c3156..76e5bcc5 100644
--- a/third_party/blink/public/platform/web_url_request.h
+++ b/third_party/blink/public/platform/web_url_request.h
@@ -41,7 +41,7 @@
namespace network {
namespace mojom {
-enum class CORSPreflightPolicy : int32_t;
+enum class CorsPreflightPolicy : int32_t;
enum class FetchCredentialsMode : int32_t;
enum class FetchRedirectMode : int32_t;
enum class FetchRequestMode : int32_t;
@@ -284,8 +284,8 @@
// https://wicg.github.io/cors-rfc1918/#external-request
BLINK_PLATFORM_EXPORT bool IsExternalRequest() const;
- BLINK_PLATFORM_EXPORT network::mojom::CORSPreflightPolicy
- GetCORSPreflightPolicy() const;
+ BLINK_PLATFORM_EXPORT network::mojom::CorsPreflightPolicy
+ GetCorsPreflightPolicy() const;
BLINK_PLATFORM_EXPORT void SetNavigationStartTime(base::TimeTicks);
diff --git a/third_party/blink/public/web/web_associated_url_loader_options.h b/third_party/blink/public/web/web_associated_url_loader_options.h
index 120995c..cd727b6 100644
--- a/third_party/blink/public/web/web_associated_url_loader_options.h
+++ b/third_party/blink/public/web/web_associated_url_loader_options.h
@@ -47,8 +47,8 @@
// When true, omit origin related checks. USE WITH CARE.
bool grant_universal_access = false;
- network::mojom::CORSPreflightPolicy preflight_policy =
- network::mojom::CORSPreflightPolicy::kConsiderPreflight;
+ network::mojom::CorsPreflightPolicy preflight_policy =
+ network::mojom::CorsPreflightPolicy::kConsiderPreflight;
};
} // namespace blink
diff --git a/third_party/blink/public/web/web_security_policy.h b/third_party/blink/public/web/web_security_policy.h
index 6957a0e..cefd9f4 100644
--- a/third_party/blink/public/web/web_security_policy.h
+++ b/third_party/blink/public/web/web_security_policy.h
@@ -72,20 +72,20 @@
// In the case where both an allowlist and blocklist rule of the same
// priority match a request the blocklist rule takes priority.
// Callers should use
- // network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority as the
+ // network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority as the
// default priority unless overriding existing entries is explicitly needed.
BLINK_EXPORT static void AddOriginAccessAllowListEntry(
const WebURL& source_origin,
const WebString& destination_protocol,
const WebString& destination_host,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority);
+ const network::mojom::CorsOriginAccessMatchPriority priority);
BLINK_EXPORT static void AddOriginAccessBlockListEntry(
const WebURL& source_origin,
const WebString& destination_protocol,
const WebString& destination_host,
bool disallow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority);
+ const network::mojom::CorsOriginAccessMatchPriority priority);
BLINK_EXPORT static void ClearOriginAccessListForOrigin(
const WebURL& source_origin);
BLINK_EXPORT static void ClearOriginAccessList();
diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/third_party/blink/renderer/core/css/remote_font_face_source.cc
index 3396422..57798f3 100644
--- a/third_party/blink/renderer/core/css/remote_font_face_source.cc
+++ b/third_party/blink/renderer/core/css/remote_font_face_source.cc
@@ -330,11 +330,11 @@
int duration = static_cast<int>(CurrentTimeMS() - load_start_time_);
RecordLoadTimeHistogram(font, duration);
- enum { kCORSFail, kCORSSuccess, kCORSEnumMax };
+ enum { kCorsFail, kCorsSuccess, kCorsEnumMax };
int cors_value =
- font->GetResponse().IsCORSSameOrigin() ? kCORSSuccess : kCORSFail;
+ font->GetResponse().IsCorsSameOrigin() ? kCorsSuccess : kCorsFail;
DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, cors_histogram,
- ("WebFont.CORSSuccess", kCORSEnumMax));
+ ("WebFont.CORSSuccess", kCorsEnumMax));
cors_histogram.Count(cors_value);
}
}
diff --git a/third_party/blink/renderer/core/exported/web_associated_url_loader_impl.cc b/third_party/blink/renderer/core/exported/web_associated_url_loader_impl.cc
index 7797037..190110b5 100644
--- a/third_party/blink/renderer/core/exported/web_associated_url_loader_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_associated_url_loader_impl.cc
@@ -208,9 +208,9 @@
return;
if (options_.expose_all_response_headers ||
- (fetch_request_mode_ != network::mojom::FetchRequestMode::kCORS &&
+ (fetch_request_mode_ != network::mojom::FetchRequestMode::kCors &&
fetch_request_mode_ !=
- network::mojom::FetchRequestMode::kCORSWithForcedPreflight)) {
+ network::mojom::FetchRequestMode::kCorsWithForcedPreflight)) {
// Use the original ResourceResponse.
client_->DidReceiveResponse(WrappedResourceResponse(response));
return;
@@ -374,7 +374,7 @@
allow_load = validator.IsSafe();
}
}
- new_request.ToMutableResourceRequest().SetCORSPreflightPolicy(
+ new_request.ToMutableResourceRequest().SetCorsPreflightPolicy(
options_.preflight_policy);
scoped_refptr<base::SingleThreadTaskRunner> task_runner;
@@ -398,7 +398,7 @@
if (options_.grant_universal_access) {
const auto mode = new_request.GetFetchRequestMode();
- DCHECK(mode == network::mojom::FetchRequestMode::kNoCORS ||
+ DCHECK(mode == network::mojom::FetchRequestMode::kNoCors ||
mode == network::mojom::FetchRequestMode::kNavigate);
scoped_refptr<SecurityOrigin> origin =
SecurityOrigin::CreateUniqueOpaque();
diff --git a/third_party/blink/renderer/core/exported/web_associated_url_loader_impl_test.cc b/third_party/blink/renderer/core/exported/web_associated_url_loader_impl_test.cc
index bfe6ebe..1af35bb 100644
--- a/third_party/blink/renderer/core/exported/web_associated_url_loader_impl_test.cc
+++ b/third_party/blink/renderer/core/exported/web_associated_url_loader_impl_test.cc
@@ -215,7 +215,7 @@
KURL url = ToKURL(id);
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
@@ -331,7 +331,7 @@
KURL url =
ToKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
expected_response_ = WebURLResponse();
@@ -360,7 +360,7 @@
// credentials can't be sent to a server which returns the header
// "access-control-allow-origin" with "*" as its value.
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
expected_response_ = WebURLResponse();
expected_response_.SetMIMEType("text/html");
@@ -389,7 +389,7 @@
KURL url =
ToKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
expected_response_ = WebURLResponse();
@@ -495,7 +495,7 @@
KURL redirect_url = ToKURL(redirect);
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
expected_redirect_response_ = WebURLResponse();
@@ -538,7 +538,7 @@
KURL redirect_url = ToKURL(redirect);
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
// Add a CORS simple header.
request.SetHTTPHeaderField("accept", "application/json");
@@ -659,7 +659,7 @@
KURL url =
ToKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
WebURLRequest request(url);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
WebString header_name_string(WebString::FromUTF8("non-whitelisted"));
@@ -690,7 +690,7 @@
WebURLRequest request(url);
request.SetRequestContext(mojom::RequestContextType::PLUGIN);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kNoCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kNoCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
expected_response_ = WebURLResponse();
@@ -717,7 +717,7 @@
WebURLRequest request(url);
request.SetRequestContext(mojom::RequestContextType::PLUGIN);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kNoCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kNoCors);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
expected_response_ = WebURLResponse();
diff --git a/third_party/blink/renderer/core/exported/web_security_policy.cc b/third_party/blink/renderer/core/exported/web_security_policy.cc
index e944fe8..732fb8ec 100644
--- a/third_party/blink/renderer/core/exported/web_security_policy.cc
+++ b/third_party/blink/renderer/core/exported/web_security_policy.cc
@@ -71,7 +71,7 @@
const WebString& destination_protocol,
const WebString& destination_host,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
SecurityPolicy::AddOriginAccessAllowListEntry(
*SecurityOrigin::Create(source_origin), destination_protocol,
destination_host, allow_destination_subdomains, priority);
@@ -82,7 +82,7 @@
const WebString& destination_protocol,
const WebString& destination_host,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
SecurityPolicy::AddOriginAccessBlockListEntry(
*SecurityOrigin::Create(source_origin), destination_protocol,
destination_host, allow_destination_subdomains, priority);
diff --git a/third_party/blink/renderer/core/fetch/fetch_manager.cc b/third_party/blink/renderer/core/fetch/fetch_manager.cc
index c388917..353cc643 100644
--- a/third_party/blink/renderer/core/fetch/fetch_manager.cc
+++ b/third_party/blink/renderer/core/fetch/fetch_manager.cc
@@ -287,7 +287,7 @@
SubresourceIntegrity::ReportInfo report_info;
bool check_result = true;
if (response_type_ != FetchResponseType::kBasic &&
- response_type_ != FetchResponseType::kCORS &&
+ response_type_ != FetchResponseType::kCors &&
response_type_ != FetchResponseType::kDefault) {
report_info.AddConsoleErrorMessage(
"Subresource Integrity: The resource '" + url_.ElidedString() +
@@ -473,12 +473,12 @@
// TODO(hiroshige): currently redirects to data URLs in no-cors
// mode is also rejected by Chromium side.
switch (fetch_request_data_->Mode()) {
- case FetchRequestMode::kNoCORS:
+ case FetchRequestMode::kNoCors:
tainting = FetchRequestData::kOpaqueTainting;
break;
case FetchRequestMode::kSameOrigin:
- case FetchRequestMode::kCORS:
- case FetchRequestMode::kCORSWithForcedPreflight:
+ case FetchRequestMode::kCors:
+ case FetchRequestMode::kCorsWithForcedPreflight:
case FetchRequestMode::kNavigate:
PerformNetworkError("Fetch API cannot load " +
fetch_request_data_->Url().GetString() +
@@ -495,12 +495,12 @@
case FetchRequestMode::kSameOrigin:
NOTREACHED();
break;
- case FetchRequestMode::kNoCORS:
+ case FetchRequestMode::kNoCors:
tainting = FetchRequestData::kOpaqueTainting;
break;
- case FetchRequestMode::kCORS:
- case FetchRequestMode::kCORSWithForcedPreflight:
- tainting = FetchRequestData::kCORSTainting;
+ case FetchRequestMode::kCors:
+ case FetchRequestMode::kCorsWithForcedPreflight:
+ tainting = FetchRequestData::kCorsTainting;
break;
case FetchRequestMode::kNavigate:
LOG(FATAL);
@@ -513,8 +513,8 @@
case FetchResponseType::kDefault:
tainting = FetchRequestData::kBasicTainting;
break;
- case FetchResponseType::kCORS:
- tainting = FetchRequestData::kCORSTainting;
+ case FetchResponseType::kCors:
+ tainting = FetchRequestData::kCorsTainting;
break;
case FetchResponseType::kOpaque:
tainting = FetchRequestData::kOpaqueTainting;
@@ -580,11 +580,11 @@
case FetchRequestData::kBasicTainting:
tainted_response = response_data->CreateBasicFilteredResponse();
break;
- case FetchRequestData::kCORSTainting: {
+ case FetchRequestData::kCorsTainting: {
WebHTTPHeaderSet header_names = cors::ExtractCorsExposedHeaderNamesList(
fetch_request_data_->Credentials(), response);
tainted_response =
- response_data->CreateCORSFilteredResponse(header_names);
+ response_data->CreateCorsFilteredResponse(header_names);
break;
}
case FetchRequestData::kOpaqueTainting:
@@ -709,7 +709,7 @@
}
// "- |request|'s mode is |no CORS|"
- if (fetch_request_data_->Mode() == FetchRequestMode::kNoCORS) {
+ if (fetch_request_data_->Mode() == FetchRequestMode::kNoCors) {
// "If |request|'s redirect mode is not |follow|, then return a network
// error.
if (fetch_request_data_->Redirect() != FetchRedirectMode::kFollow) {
@@ -740,7 +740,7 @@
}
// "Set |request|'s response tainting to |CORS|."
- fetch_request_data_->SetResponseTainting(FetchRequestData::kCORSTainting);
+ fetch_request_data_->SetResponseTainting(FetchRequestData::kCorsTainting);
// "The result of performing an HTTP fetch using |request| with the
// |CORS flag| set."
@@ -815,9 +815,9 @@
switch (fetch_request_data_->Mode()) {
case FetchRequestMode::kSameOrigin:
- case FetchRequestMode::kNoCORS:
- case FetchRequestMode::kCORS:
- case FetchRequestMode::kCORSWithForcedPreflight:
+ case FetchRequestMode::kNoCors:
+ case FetchRequestMode::kCors:
+ case FetchRequestMode::kCorsWithForcedPreflight:
request.SetFetchRequestMode(fetch_request_data_->Mode());
break;
case FetchRequestMode::kNavigate:
@@ -860,8 +860,8 @@
request.SetSkipServiceWorker(is_isolated_world_);
if (fetch_request_data_->Keepalive()) {
- if (!cors::IsCORSSafelistedMethod(request.HttpMethod()) ||
- !cors::ContainsOnlyCORSSafelistedOrForbiddenHeaders(
+ if (!cors::IsCorsSafelistedMethod(request.HttpMethod()) ||
+ !cors::ContainsOnlyCorsSafelistedOrForbiddenHeaders(
request.HttpHeaderFields())) {
PerformNetworkError(
"Preflight request for request with keepalive "
diff --git a/third_party/blink/renderer/core/fetch/fetch_request_data.cc b/third_party/blink/renderer/core/fetch/fetch_request_data.cc
index 636cd3d..745656e 100644
--- a/third_party/blink/renderer/core/fetch/fetch_request_data.cc
+++ b/third_party/blink/renderer/core/fetch/fetch_request_data.cc
@@ -130,7 +130,7 @@
same_origin_data_url_flag_(false),
referrer_string_(Referrer::ClientReferrerString()),
referrer_policy_(kReferrerPolicyDefault),
- mode_(network::mojom::FetchRequestMode::kNoCORS),
+ mode_(network::mojom::FetchRequestMode::kNoCors),
credentials_(network::mojom::FetchCredentialsMode::kOmit),
cache_mode_(mojom::FetchCacheMode::kDefault),
redirect_(network::mojom::FetchRedirectMode::kFollow),
diff --git a/third_party/blink/renderer/core/fetch/fetch_request_data.h b/third_party/blink/renderer/core/fetch/fetch_request_data.h
index 7228e04..6b593bc 100644
--- a/third_party/blink/renderer/core/fetch/fetch_request_data.h
+++ b/third_party/blink/renderer/core/fetch/fetch_request_data.h
@@ -33,7 +33,7 @@
class FetchRequestData final
: public GarbageCollectedFinalized<FetchRequestData> {
public:
- enum Tainting { kBasicTainting, kCORSTainting, kOpaqueTainting };
+ enum Tainting { kBasicTainting, kCorsTainting, kOpaqueTainting };
static FetchRequestData* Create();
static FetchRequestData* Create(ScriptState*, const WebServiceWorkerRequest&);
diff --git a/third_party/blink/renderer/core/fetch/fetch_response_data.cc b/third_party/blink/renderer/core/fetch/fetch_response_data.cc
index ccc29598..87e1646 100644
--- a/third_party/blink/renderer/core/fetch/fetch_response_data.cc
+++ b/third_party/blink/renderer/core/fetch/fetch_response_data.cc
@@ -81,7 +81,7 @@
return response;
}
-FetchResponseData* FetchResponseData::CreateCORSFilteredResponse(
+FetchResponseData* FetchResponseData::CreateCorsFilteredResponse(
const WebHTTPHeaderSet& exposed_headers) const {
DCHECK_EQ(type_, Type::kDefault);
// "A CORS filtered response is a filtered response whose type is |CORS|,
@@ -92,7 +92,7 @@
// parsing `Access-Control-Expose-Headers` in internal response's header
// list."
FetchResponseData* response =
- new FetchResponseData(Type::kCORS, status_, status_message_);
+ new FetchResponseData(Type::kCors, status_, status_message_);
response->SetURLList(url_list_);
for (const auto& header : header_list_->List()) {
const String& name = header.first;
@@ -194,7 +194,7 @@
switch (type_) {
case Type::kBasic:
- case Type::kCORS:
+ case Type::kCors:
DCHECK(internal_response_);
DCHECK_EQ(buffer_, internal_response_->buffer_);
DCHECK_EQ(internal_response_->type_, Type::kDefault);
@@ -293,7 +293,7 @@
response_time_(base::Time::Now()) {}
void FetchResponseData::ReplaceBodyStreamBuffer(BodyStreamBuffer* buffer) {
- if (type_ == Type::kBasic || type_ == Type::kCORS) {
+ if (type_ == Type::kBasic || type_ == Type::kCors) {
DCHECK(internal_response_);
internal_response_->buffer_ = buffer;
buffer_ = buffer;
diff --git a/third_party/blink/renderer/core/fetch/fetch_response_data.h b/third_party/blink/renderer/core/fetch/fetch_response_data.h
index 84578eb..2ffc6e7 100644
--- a/third_party/blink/renderer/core/fetch/fetch_response_data.h
+++ b/third_party/blink/renderer/core/fetch/fetch_response_data.h
@@ -45,7 +45,7 @@
static FetchResponseData* CreateWithBuffer(BodyStreamBuffer*);
FetchResponseData* CreateBasicFilteredResponse() const;
- FetchResponseData* CreateCORSFilteredResponse(
+ FetchResponseData* CreateCorsFilteredResponse(
const WebHTTPHeaderSet& exposed_headers) const;
FetchResponseData* CreateOpaqueFilteredResponse() const;
FetchResponseData* CreateOpaqueRedirectFilteredResponse() const;
diff --git a/third_party/blink/renderer/core/fetch/fetch_response_data_test.cc b/third_party/blink/renderer/core/fetch/fetch_response_data_test.cc
index e2772ef..2c645d06 100644
--- a/third_party/blink/renderer/core/fetch/fetch_response_data_test.cc
+++ b/third_party/blink/renderer/core/fetch/fetch_response_data_test.cc
@@ -93,10 +93,10 @@
CheckHeaders(web_response);
}
-TEST_F(FetchResponseDataTest, CORSFilter) {
+TEST_F(FetchResponseDataTest, CorsFilter) {
FetchResponseData* internal_response = CreateInternalResponse();
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse(WebHTTPHeaderSet());
+ internal_response->CreateCorsFilteredResponse(WebHTTPHeaderSet());
EXPECT_EQ(internal_response, cors_response_data->InternalResponse());
@@ -111,13 +111,13 @@
}
TEST_F(FetchResponseDataTest,
- CORSFilterOnResponseWithAccessControlExposeHeaders) {
+ CorsFilterOnResponseWithAccessControlExposeHeaders) {
FetchResponseData* internal_response = CreateInternalResponse();
internal_response->HeaderList()->Append("access-control-expose-headers",
"set-cookie, bar");
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse({"set-cookie", "bar"});
+ internal_response->CreateCorsFilteredResponse({"set-cookie", "bar"});
EXPECT_EQ(internal_response, cors_response_data->InternalResponse());
@@ -128,10 +128,10 @@
EXPECT_EQ("bar", bar_value);
}
-TEST_F(FetchResponseDataTest, CORSFilterWithEmptyHeaderSet) {
+TEST_F(FetchResponseDataTest, CorsFilterWithEmptyHeaderSet) {
FetchResponseData* internal_response = CreateInternalResponse();
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse(WebHTTPHeaderSet());
+ internal_response->CreateCorsFilteredResponse(WebHTTPHeaderSet());
EXPECT_EQ(internal_response, cors_response_data->InternalResponse());
@@ -146,13 +146,13 @@
}
TEST_F(FetchResponseDataTest,
- CORSFilterWithEmptyHeaderSetOnResponseWithAccessControlExposeHeaders) {
+ CorsFilterWithEmptyHeaderSetOnResponseWithAccessControlExposeHeaders) {
FetchResponseData* internal_response = CreateInternalResponse();
internal_response->HeaderList()->Append("access-control-expose-headers",
"set-cookie, bar");
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse(WebHTTPHeaderSet());
+ internal_response->CreateCorsFilteredResponse(WebHTTPHeaderSet());
EXPECT_EQ(internal_response, cors_response_data->InternalResponse());
@@ -166,14 +166,14 @@
EXPECT_EQ("no-cache", cache_control_value);
}
-TEST_F(FetchResponseDataTest, CORSFilterWithExplicitHeaderSet) {
+TEST_F(FetchResponseDataTest, CorsFilterWithExplicitHeaderSet) {
FetchResponseData* internal_response = CreateInternalResponse();
WebHTTPHeaderSet exposed_headers;
exposed_headers.insert("set-cookie");
exposed_headers.insert("bar");
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse(exposed_headers);
+ internal_response->CreateCorsFilteredResponse(exposed_headers);
EXPECT_EQ(internal_response, cors_response_data->InternalResponse());
@@ -184,14 +184,14 @@
EXPECT_EQ("bar", bar_value);
}
-TEST_F(FetchResponseDataTest, ToWebServiceWorkerCORSType) {
+TEST_F(FetchResponseDataTest, ToWebServiceWorkerCorsType) {
WebServiceWorkerResponse web_response;
FetchResponseData* internal_response = CreateInternalResponse();
FetchResponseData* cors_response_data =
- internal_response->CreateCORSFilteredResponse(WebHTTPHeaderSet());
+ internal_response->CreateCorsFilteredResponse(WebHTTPHeaderSet());
cors_response_data->PopulateWebServiceWorkerResponse(web_response);
- EXPECT_EQ(network::mojom::FetchResponseType::kCORS,
+ EXPECT_EQ(network::mojom::FetchResponseType::kCors,
web_response.ResponseType());
CheckHeaders(web_response);
}
diff --git a/third_party/blink/renderer/core/fetch/headers.cc b/third_party/blink/renderer/core/fetch/headers.cc
index abba626..0334e25 100644
--- a/third_party/blink/renderer/core/fetch/headers.cc
+++ b/third_party/blink/renderer/core/fetch/headers.cc
@@ -99,8 +99,8 @@
return;
// "5. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
// no-CORS-safelisted header, return."
- if (guard_ == kRequestNoCORSGuard &&
- !cors::IsNoCORSSafelistedHeader(name, normalized_value)) {
+ if (guard_ == kRequestNoCorsGuard &&
+ !cors::IsNoCorsSafelistedHeader(name, normalized_value)) {
return;
}
// "6. Otherwise, if guard is |response| and |name| is a forbidden response
@@ -131,8 +131,8 @@
return;
// "4. Otherwise, if guard is |request-no-CORS| and |name|/`invalid` is not
// a no-CORS-safelisted header, return."
- if (guard_ == kRequestNoCORSGuard &&
- !cors::IsNoCORSSafelistedHeader(name, "invalid")) {
+ if (guard_ == kRequestNoCorsGuard &&
+ !cors::IsNoCorsSafelistedHeader(name, "invalid")) {
return;
}
// "5. Otherwise, if guard is |response| and |name| is a forbidden response
@@ -199,8 +199,8 @@
return;
// "5. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
// no-CORS-safelisted header, return."
- if (guard_ == kRequestNoCORSGuard &&
- !cors::IsNoCORSSafelistedHeader(name, normalized_value)) {
+ if (guard_ == kRequestNoCorsGuard &&
+ !cors::IsNoCorsSafelistedHeader(name, normalized_value)) {
return;
}
// "6. Otherwise, if guard is |response| and |name| is a forbidden response
diff --git a/third_party/blink/renderer/core/fetch/headers.h b/third_party/blink/renderer/core/fetch/headers.h
index 6c860fb..0fbdd7e 100644
--- a/third_party/blink/renderer/core/fetch/headers.h
+++ b/third_party/blink/renderer/core/fetch/headers.h
@@ -28,7 +28,7 @@
enum Guard {
kImmutableGuard,
kRequestGuard,
- kRequestNoCORSGuard,
+ kRequestNoCorsGuard,
kResponseGuard,
kNoneGuard
};
diff --git a/third_party/blink/renderer/core/fetch/request.cc b/third_party/blink/renderer/core/fetch/request.cc
index 040aefe..d43d1b1 100644
--- a/third_party/blink/renderer/core/fetch/request.cc
+++ b/third_party/blink/renderer/core/fetch/request.cc
@@ -355,14 +355,14 @@
if (init->mode() == "same-origin") {
request->SetMode(network::mojom::FetchRequestMode::kSameOrigin);
} else if (init->mode() == "no-cors") {
- request->SetMode(network::mojom::FetchRequestMode::kNoCORS);
+ request->SetMode(network::mojom::FetchRequestMode::kNoCors);
} else if (init->mode() == "cors") {
- request->SetMode(network::mojom::FetchRequestMode::kCORS);
+ request->SetMode(network::mojom::FetchRequestMode::kCors);
} else {
// |inputRequest| is directly checked here instead of setting and
// checking |fallbackMode| as specified in the spec.
if (!input_request)
- request->SetMode(network::mojom::FetchRequestMode::kCORS);
+ request->SetMode(network::mojom::FetchRequestMode::kCors);
}
// This is not yet standardized, but we can assume the following:
@@ -474,16 +474,16 @@
// "Empty |r|'s request's header list."
r->request_->HeaderList()->ClearList();
// "If |r|'s request's mode is "no-cors", run these substeps:
- if (r->GetRequest()->Mode() == network::mojom::FetchRequestMode::kNoCORS) {
+ if (r->GetRequest()->Mode() == network::mojom::FetchRequestMode::kNoCors) {
// "If |r|'s request's method is not a CORS-safelisted method, throw a
// TypeError."
- if (!cors::IsCORSSafelistedMethod(r->GetRequest()->Method())) {
+ if (!cors::IsCorsSafelistedMethod(r->GetRequest()->Method())) {
exception_state.ThrowTypeError("'" + r->GetRequest()->Method() +
"' is unsupported in no-cors mode.");
return nullptr;
}
// "Set |r|'s Headers object's guard to "request-no-cors"."
- r->getHeaders()->SetGuard(Headers::kRequestNoCORSGuard);
+ r->getHeaders()->SetGuard(Headers::kRequestNoCorsGuard);
}
// "If |signal| is not null, then make |r|’s signal follow |signal|."
if (signal)
@@ -758,10 +758,10 @@
switch (request_->Mode()) {
case network::mojom::FetchRequestMode::kSameOrigin:
return "same-origin";
- case network::mojom::FetchRequestMode::kNoCORS:
+ case network::mojom::FetchRequestMode::kNoCors:
return "no-cors";
- case network::mojom::FetchRequestMode::kCORS:
- case network::mojom::FetchRequestMode::kCORSWithForcedPreflight:
+ case network::mojom::FetchRequestMode::kCors:
+ case network::mojom::FetchRequestMode::kCorsWithForcedPreflight:
return "cors";
case network::mojom::FetchRequestMode::kNavigate:
return "navigate";
diff --git a/third_party/blink/renderer/core/fetch/response.cc b/third_party/blink/renderer/core/fetch/response.cc
index 108791d..15d26c8b 100644
--- a/third_party/blink/renderer/core/fetch/response.cc
+++ b/third_party/blink/renderer/core/fetch/response.cc
@@ -44,20 +44,20 @@
namespace {
-template <typename CORSHeadersContainer>
+template <typename CorsHeadersContainer>
FetchResponseData* FilterResponseData(
network::mojom::FetchResponseType response_type,
FetchResponseData* response,
- CORSHeadersContainer& headers) {
+ CorsHeadersContainer& headers) {
switch (response_type) {
case network::mojom::FetchResponseType::kBasic:
return response->CreateBasicFilteredResponse();
break;
- case network::mojom::FetchResponseType::kCORS: {
+ case network::mojom::FetchResponseType::kCors: {
WebHTTPHeaderSet header_names;
for (const auto& header : headers)
header_names.insert(header.Ascii().data());
- return response->CreateCORSFilteredResponse(header_names);
+ return response->CreateCorsFilteredResponse(header_names);
break;
}
case network::mojom::FetchResponseType::kOpaque:
@@ -364,7 +364,7 @@
switch (response_->GetType()) {
case network::mojom::FetchResponseType::kBasic:
return "basic";
- case network::mojom::FetchResponseType::kCORS:
+ case network::mojom::FetchResponseType::kCors:
return "cors";
case network::mojom::FetchResponseType::kDefault:
return "default";
diff --git a/third_party/blink/renderer/core/fetch/response_test.cc b/third_party/blink/renderer/core/fetch/response_test.cc
index b3abfbf..4bca9a8b 100644
--- a/third_party/blink/renderer/core/fetch/response_test.cc
+++ b/third_party/blink/renderer/core/fetch/response_test.cc
@@ -129,7 +129,7 @@
CheckResponseStream(scope.GetScriptState(), response, true);
}
-TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS) {
+TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneCors) {
V8TestingScope scope;
BodyStreamBuffer* buffer = CreateHelloWorldBuffer(scope.GetScriptState());
FetchResponseData* fetch_response_data =
@@ -137,7 +137,7 @@
Vector<KURL> url_list;
url_list.push_back(KURL("http://www.response.com"));
fetch_response_data->SetURLList(url_list);
- fetch_response_data = fetch_response_data->CreateCORSFilteredResponse({});
+ fetch_response_data = fetch_response_data->CreateCorsFilteredResponse({});
Response* response =
Response::Create(scope.GetExecutionContext(), fetch_response_data);
EXPECT_EQ(response->InternalBodyBuffer(), buffer);
diff --git a/third_party/blink/renderer/core/html/link_style.cc b/third_party/blink/renderer/core/html/link_style.cc
index 3aa8d76..2e56c4f 100644
--- a/third_party/blink/renderer/core/html/link_style.cc
+++ b/third_party/blink/renderer/core/html/link_style.cc
@@ -263,7 +263,7 @@
if (GetResource()) {
RemovePendingSheet();
ClearResource();
- ClearFetchFollowingCORS();
+ ClearFetchFollowingCors();
}
if (!owner_->ShouldLoadLink())
@@ -292,7 +292,7 @@
AddPendingSheet(blocking ? kBlocking : kNonBlocking);
if (params.cross_origin != kCrossOriginAttributeNotSet) {
- SetFetchFollowingCORS();
+ SetFetchFollowingCors();
}
// Load stylesheets that are not needed for the layout immediately with low
diff --git a/third_party/blink/renderer/core/html/link_style.h b/third_party/blink/renderer/core/html/link_style.h
index ba766ba..a9b281b 100644
--- a/third_party/blink/renderer/core/html/link_style.h
+++ b/third_party/blink/renderer/core/html/link_style.h
@@ -75,11 +75,11 @@
void RemovePendingSheet();
void SetCrossOriginStylesheetStatus(CSSStyleSheet*);
- void SetFetchFollowingCORS() {
+ void SetFetchFollowingCors() {
DCHECK(!fetch_following_cors_);
fetch_following_cors_ = true;
}
- void ClearFetchFollowingCORS() { fetch_following_cors_ = false; }
+ void ClearFetchFollowingCors() { fetch_following_cors_ = false; }
Member<CSSStyleSheet> sheet_;
DisabledState disabled_state_;
diff --git a/third_party/blink/renderer/core/html/media/html_media_element.cc b/third_party/blink/renderer/core/html/media/html_media_element.cc
index 2077228..1e86f0c 100644
--- a/third_party/blink/renderer/core/html/media/html_media_element.cc
+++ b/third_party/blink/renderer/core/html/media/html_media_element.cc
@@ -1492,7 +1492,7 @@
return true;
}
-bool HTMLMediaElement::IsMediaDataCORSSameOrigin() const {
+bool HTMLMediaElement::IsMediaDataCorsSameOrigin() const {
if (!GetWebMediaPlayer())
return true;
@@ -3939,13 +3939,13 @@
GetAudioSourceProvider().SetClient(audio_source_node_);
}
-WebMediaPlayer::CORSMode HTMLMediaElement::CorsMode() const {
+WebMediaPlayer::CorsMode HTMLMediaElement::CorsMode() const {
const AtomicString& cross_origin_mode = FastGetAttribute(kCrossoriginAttr);
if (cross_origin_mode.IsNull())
- return WebMediaPlayer::kCORSModeUnspecified;
+ return WebMediaPlayer::kCorsModeUnspecified;
if (DeprecatedEqualIgnoringCase(cross_origin_mode, "use-credentials"))
- return WebMediaPlayer::kCORSModeUseCredentials;
- return WebMediaPlayer::kCORSModeAnonymous;
+ return WebMediaPlayer::kCorsModeUseCredentials;
+ return WebMediaPlayer::kCorsModeAnonymous;
}
void HTMLMediaElement::SetCcLayer(cc::Layer* cc_layer) {
@@ -4264,7 +4264,7 @@
}
bool HTMLMediaElement::MediaShouldBeOpaque() const {
- return !IsMediaDataCORSSameOrigin() && ready_state_ < kHaveMetadata &&
+ return !IsMediaDataCorsSameOrigin() && ready_state_ < kHaveMetadata &&
!FastGetAttribute(kSrcAttr).IsEmpty() &&
EffectivePreloadType() != WebMediaPlayer::kPreloadNone;
}
diff --git a/third_party/blink/renderer/core/html/media/html_media_element.h b/third_party/blink/renderer/core/html/media/html_media_element.h
index db911a5..84708f0 100644
--- a/third_party/blink/renderer/core/html/media/html_media_element.h
+++ b/third_party/blink/renderer/core/html/media/html_media_element.h
@@ -301,7 +301,7 @@
bool IsSafeToLoadURL(const KURL&, InvalidURLAction);
// Checks to see if current media data is CORS-same-origin.
- bool IsMediaDataCORSSameOrigin() const;
+ bool IsMediaDataCorsSameOrigin() const;
// Returns this media element is in a cross-origin frame.
bool IsInCrossOriginFrame() const;
@@ -525,7 +525,7 @@
void ChangeNetworkStateFromLoadingToIdle();
- WebMediaPlayer::CORSMode CorsMode() const;
+ WebMediaPlayer::CorsMode CorsMode() const;
// Returns the "direction of playback" value as specified in the HTML5 spec.
enum DirectionOfPlayback { kBackward, kForward };
diff --git a/third_party/blink/renderer/core/html/media/html_media_element_test.cc b/third_party/blink/renderer/core/html/media/html_media_element_test.cc
index 5c9b880..2e76aa10 100644
--- a/third_party/blink/renderer/core/html/media/html_media_element_test.cc
+++ b/third_party/blink/renderer/core/html/media/html_media_element_test.cc
@@ -38,7 +38,7 @@
Load,
WebMediaPlayer::LoadTiming(LoadType load_type,
const blink::WebMediaPlayerSource& source,
- CORSMode cors_mode));
+ CorsMode cors_mode));
MOCK_CONST_METHOD0(DidLazyLoad, bool());
};
diff --git a/third_party/blink/renderer/core/html/media/html_video_element.cc b/third_party/blink/renderer/core/html/media/html_video_element.cc
index 6556fba..c2ba6f2 100644
--- a/third_party/blink/renderer/core/html/media/html_video_element.cc
+++ b/third_party/blink/renderer/core/html/media/html_video_element.cc
@@ -583,7 +583,7 @@
}
bool HTMLVideoElement::WouldTaintOrigin(const SecurityOrigin*) const {
- return !IsMediaDataCORSSameOrigin();
+ return !IsMediaDataCorsSameOrigin();
}
FloatSize HTMLVideoElement::ElementSize(const FloatSize&) const {
diff --git a/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc b/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
index 87cc5c4..8776c33 100644
--- a/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
+++ b/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
@@ -54,7 +54,7 @@
const char* expected_referrer;
};
-struct CORSTestCase {
+struct CorsTestCase {
const char* base_url;
const char* input_html;
network::mojom::FetchRequestMode request_mode;
@@ -151,7 +151,7 @@
}
}
- void CORSRequestVerification(
+ void CorsRequestVerification(
Document* document,
network::mojom::FetchRequestMode request_mode,
network::mojom::FetchCredentialsMode credentials_mode) {
@@ -299,14 +299,14 @@
}
}
- void Test(CORSTestCase test_case) {
+ void Test(CorsTestCase test_case) {
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests =
scanner_->Scan(base_url, nullptr, seen_csp_meta_tag_);
preloader.TakeAndPreload(requests);
- preloader.CORSRequestVerification(&GetDocument(), test_case.request_mode,
+ preloader.CorsRequestVerification(&GetDocument(), test_case.request_mode,
test_case.credentials_mode);
}
@@ -878,29 +878,29 @@
Test(test_case);
}
-TEST_F(HTMLPreloadScannerTest, testCORS) {
- CORSTestCase test_cases[] = {
+TEST_F(HTMLPreloadScannerTest, testCors) {
+ CorsTestCase test_cases[] = {
{"http://example.test", "<script src='/https/chromium.googlesource.com/script'></script>",
- network::mojom::FetchRequestMode::kNoCORS,
+ network::mojom::FetchRequestMode::kNoCors,
network::mojom::FetchCredentialsMode::kInclude},
{"http://example.test", "<script crossorigin src='/https/chromium.googlesource.com/script'></script>",
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
network::mojom::FetchCredentialsMode::kSameOrigin},
{"http://example.test",
"<script crossorigin=use-credentials src='/https/chromium.googlesource.com/script'></script>",
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
network::mojom::FetchCredentialsMode::kInclude},
{"http://example.test", "<script type='module' src='/https/chromium.googlesource.com/script'></script>",
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
network::mojom::FetchCredentialsMode::kSameOrigin},
{"http://example.test",
"<script type='module' crossorigin='anonymous' src='/https/chromium.googlesource.com/script'></script>",
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
network::mojom::FetchCredentialsMode::kSameOrigin},
{"http://example.test",
"<script type='module' crossorigin='use-credentials' "
"src='/script'></script>",
- network::mojom::FetchRequestMode::kCORS,
+ network::mojom::FetchRequestMode::kCors,
network::mojom::FetchCredentialsMode::kInclude},
};
diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
index b3348be..ebf6d32 100644
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
@@ -1021,7 +1021,7 @@
encoded_data_length, should_report_corb_blocking);
}
-void InspectorNetworkAgent::DidReceiveCORSRedirectResponse(
+void InspectorNetworkAgent::DidReceiveCorsRedirectResponse(
unsigned long identifier,
DocumentLoader* loader,
const ResourceResponse& response,
@@ -1660,7 +1660,7 @@
(!IsMainThread() && worker_global_scope_));
}
-void InspectorNetworkAgent::ShouldForceCORSPreflight(bool* result) {
+void InspectorNetworkAgent::ShouldForceCorsPreflight(bool* result) {
if (cache_disabled_.Get())
*result = true;
}
diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.h b/third_party/blink/renderer/core/inspector/inspector_network_agent.h
index beeaa32..972f1e27 100644
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.h
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.h
@@ -122,7 +122,7 @@
int64_t encoded_data_length,
int64_t decoded_body_length,
bool should_report_corb_blocking);
- void DidReceiveCORSRedirectResponse(unsigned long identifier,
+ void DidReceiveCorsRedirectResponse(unsigned long identifier,
DocumentLoader*,
const ResourceResponse&,
Resource*);
@@ -132,7 +132,7 @@
void DidCommitLoad(LocalFrame*, DocumentLoader*);
void ScriptImported(unsigned long identifier, const String& source_string);
void DidReceiveScriptResponse(unsigned long identifier);
- void ShouldForceCORSPreflight(bool* result);
+ void ShouldForceCorsPreflight(bool* result);
void ShouldBlockRequest(const KURL&, bool* result);
void ShouldBypassServiceWorker(bool* result);
diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/third_party/blink/renderer/core/loader/base_fetch_context.cc
index 075060e..314ef814 100644
--- a/third_party/blink/renderer/core/loader/base_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/base_fetch_context.cc
@@ -324,7 +324,7 @@
}
if (request_mode == network::mojom::FetchRequestMode::kSameOrigin &&
- cors::CalculateCORSFlag(url, origin.get(), request_mode)) {
+ cors::CalculateCorsFlag(url, origin.get(), request_mode)) {
PrintAccessDeniedMessage(url);
return ResourceRequestBlockedReason::kOrigin;
}
diff --git a/third_party/blink/renderer/core/loader/mixed_content_checker.cc b/third_party/blink/renderer/core/loader/mixed_content_checker.cc
index 00ed71e..0bfe2a08 100644
--- a/third_party/blink/renderer/core/loader/mixed_content_checker.cc
+++ b/third_party/blink/renderer/core/loader/mixed_content_checker.cc
@@ -399,7 +399,7 @@
// launching external applications via URLs. http://crbug.com/318788 and
// https://crbug.com/393481
if (frame_type == network::mojom::RequestContextFrameType::kNested &&
- !SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(url.Protocol()))
+ !SchemeRegistry::ShouldTreatURLSchemeAsCorsEnabled(url.Protocol()))
context_type = WebMixedContentContextType::kOptionallyBlockable;
switch (context_type) {
@@ -783,7 +783,7 @@
// subframe.
if (request.GetFrameType() ==
network::mojom::RequestContextFrameType::kNested &&
- !SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(
+ !SchemeRegistry::ShouldTreatURLSchemeAsCorsEnabled(
request.Url().Protocol())) {
return WebMixedContentContextType::kOptionallyBlockable;
}
diff --git a/third_party/blink/renderer/core/loader/resource/image_resource.cc b/third_party/blink/renderer/core/loader/resource/image_resource.cc
index 204f0ee32..d64d1e6c 100644
--- a/third_party/blink/renderer/core/loader/resource/image_resource.cc
+++ b/third_party/blink/renderer/core/loader/resource/image_resource.cc
@@ -708,13 +708,13 @@
ImageResourceInfo::DoesCurrentFrameHaveSingleSecurityOrigin
does_current_frame_has_single_security_origin) const {
if (GetResponse().WasFetchedViaServiceWorker())
- return GetResponse().IsCORSSameOrigin();
+ return GetResponse().IsCorsSameOrigin();
if (does_current_frame_has_single_security_origin !=
ImageResourceInfo::kHasSingleSecurityOrigin)
return false;
- if (GetResponse().IsCORSSameOrigin())
+ if (GetResponse().IsCorsSameOrigin())
return true;
return security_origin->CanReadContent(GetResponse().Url());
diff --git a/third_party/blink/renderer/core/loader/threadable_loader.cc b/third_party/blink/renderer/core/loader/threadable_loader.cc
index 98789a1b..2944e27 100644
--- a/third_party/blink/renderer/core/loader/threadable_loader.cc
+++ b/third_party/blink/renderer/core/loader/threadable_loader.cc
@@ -78,7 +78,7 @@
// Fetch API Spec: https://fetch.spec.whatwg.org/#cors-preflight-fetch-0
AtomicString CreateAccessControlRequestHeadersHeader(
const HTTPHeaderMap& headers) {
- Vector<String> filtered_headers = cors::CORSUnsafeRequestHeaderNames(headers);
+ Vector<String> filtered_headers = cors::CorsUnsafeRequestHeaderNames(headers);
if (!filtered_headers.size())
return g_null_atom;
@@ -203,7 +203,7 @@
: client_(client),
execution_context_(execution_context),
resource_loader_options_(resource_loader_options),
- out_of_blink_cors_(RuntimeEnabledFeatures::OutOfBlinkCORSEnabled()),
+ out_of_blink_cors_(RuntimeEnabledFeatures::OutOfBlinkCorsEnabled()),
is_using_data_consumer_handle_(false),
async_(resource_loader_options.synchronous_policy ==
kRequestAsynchronously),
@@ -227,11 +227,11 @@
DCHECK(async_ || request.HttpReferrer().IsEmpty());
bool cors_enabled =
- cors::IsCORSEnabledRequestMode(request.GetFetchRequestMode());
+ cors::IsCorsEnabledRequestMode(request.GetFetchRequestMode());
// kPreventPreflight can be used only when the CORS is enabled.
- DCHECK(request.CORSPreflightPolicy() ==
- network::mojom::CORSPreflightPolicy::kConsiderPreflight ||
+ DCHECK(request.CorsPreflightPolicy() ==
+ network::mojom::CorsPreflightPolicy::kConsiderPreflight ||
cors_enabled);
initial_request_url_ = request.Url();
@@ -242,10 +242,10 @@
redirect_mode_ = request.GetFetchRedirectMode();
if (request.GetFetchRequestMode() ==
- network::mojom::FetchRequestMode::kNoCORS) {
- SECURITY_CHECK(cors::IsNoCORSAllowedContext(request_context_));
+ network::mojom::FetchRequestMode::kNoCors) {
+ SECURITY_CHECK(cors::IsNoCorsAllowedContext(request_context_));
}
- cors_flag_ = cors::CalculateCORSFlag(request.Url(), GetSecurityOrigin(),
+ cors_flag_ = cors::CalculateCorsFlag(request.Url(), GetSecurityOrigin(),
request.GetFetchRequestMode());
// The CORS flag variable is not yet used at the step in the spec that
@@ -255,8 +255,8 @@
ThreadableLoaderClient* client = client_;
Clear();
client->DidFail(ResourceError(
- request.Url(), network::CORSErrorStatus(
- network::mojom::CORSError::kDisallowedByMode)));
+ request.Url(), network::CorsErrorStatus(
+ network::mojom::CorsError::kDisallowedByMode)));
return;
}
@@ -332,7 +332,7 @@
return;
}
- if (cors::IsCORSEnabledRequestMode(request.GetFetchRequestMode())) {
+ if (cors::IsCorsEnabledRequestMode(request.GetFetchRequestMode())) {
// Save the request to fallback_request_for_service_worker to use when the
// service worker doesn't handle (call respondWith()) a CORS enabled
// request.
@@ -350,7 +350,7 @@
return;
}
- DCHECK(cors::IsCORSEnabledRequestMode(request.GetFetchRequestMode()) ||
+ DCHECK(cors::IsCorsEnabledRequestMode(request.GetFetchRequestMode()) ||
request.IsExternalRequest());
MakeCrossOriginAccessRequest(request);
@@ -390,7 +390,7 @@
void ThreadableLoader::MakeCrossOriginAccessRequest(
const ResourceRequest& request) {
- DCHECK(cors::IsCORSEnabledRequestMode(request.GetFetchRequestMode()) ||
+ DCHECK(cors::IsCorsEnabledRequestMode(request.GetFetchRequestMode()) ||
request.IsExternalRequest());
DCHECK(client_);
DCHECK(!GetResource());
@@ -398,11 +398,11 @@
// Cross-origin requests are only allowed certain registered schemes. We would
// catch this when checking response headers later, but there is no reason to
// send a request, preflighted or not, that's guaranteed to be denied.
- if (!SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(
+ if (!SchemeRegistry::ShouldTreatURLSchemeAsCorsEnabled(
request.Url().Protocol())) {
DispatchDidFail(ResourceError(
- request.Url(), network::CORSErrorStatus(
- network::mojom::CORSError::kCORSDisabledScheme)));
+ request.Url(), network::CorsErrorStatus(
+ network::mojom::CorsError::kCorsDisabledScheme)));
return;
}
@@ -435,24 +435,24 @@
}
if (request.GetFetchRequestMode() !=
- network::mojom::FetchRequestMode::kCORSWithForcedPreflight) {
- if (request.CORSPreflightPolicy() ==
- network::mojom::CORSPreflightPolicy::kPreventPreflight) {
+ network::mojom::FetchRequestMode::kCorsWithForcedPreflight) {
+ if (request.CorsPreflightPolicy() ==
+ network::mojom::CorsPreflightPolicy::kPreventPreflight) {
PrepareCrossOriginRequest(cross_origin_request);
LoadRequest(cross_origin_request, cross_origin_options);
return;
}
- DCHECK_EQ(request.CORSPreflightPolicy(),
- network::mojom::CORSPreflightPolicy::kConsiderPreflight);
+ DCHECK_EQ(request.CorsPreflightPolicy(),
+ network::mojom::CorsPreflightPolicy::kConsiderPreflight);
- // We use ContainsOnlyCORSSafelistedOrForbiddenHeaders() here since
+ // We use ContainsOnlyCorsSafelistedOrForbiddenHeaders() here since
// |request| may have been modified in the process of loading (not from
// the user's input). For example, referrer. We need to accept them. For
// security, we must reject forbidden headers/methods at the point we
// accept user's input. Not here.
- if (cors::IsCORSSafelistedMethod(request.HttpMethod()) &&
- cors::ContainsOnlyCORSSafelistedOrForbiddenHeaders(
+ if (cors::IsCorsSafelistedMethod(request.HttpMethod()) &&
+ cors::ContainsOnlyCorsSafelistedOrForbiddenHeaders(
request.HttpHeaderFields())) {
PrepareCrossOriginRequest(cross_origin_request);
LoadRequest(cross_origin_request, cross_origin_options);
@@ -466,7 +466,7 @@
bool should_ignore_preflight_cache = false;
// Prevent use of the CORS preflight cache when instructed by the DevTools
// not to use caches.
- probe::shouldForceCORSPreflight(execution_context_,
+ probe::shouldForceCorsPreflight(execution_context_,
&should_ignore_preflight_cache);
if (should_ignore_preflight_cache ||
!cors::CheckIfRequestCanSkipPreflight(
@@ -579,8 +579,8 @@
HandlePreflightFailure(
original_url,
- network::CORSErrorStatus(
- network::mojom::CORSError::kPreflightDisallowedRedirect));
+ network::CorsErrorStatus(
+ network::mojom::CorsError::kPreflightDisallowedRedirect));
return false;
}
@@ -631,17 +631,17 @@
// Allow same origin requests to continue after allowing clients to audit
// the redirect.
if (!(cors_flag_ ||
- cors::CalculateCORSFlag(new_url, GetSecurityOrigin(),
+ cors::CalculateCorsFlag(new_url, GetSecurityOrigin(),
new_request.GetFetchRequestMode()))) {
bool follow =
client_->WillFollowRedirect(new_url, redirect_response_to_pass);
response_tainting_ = cors::CalculateResponseTainting(
new_url, new_request.GetFetchRequestMode(), GetSecurityOrigin(),
- CORSFlag::Unset);
+ CorsFlag::Unset);
return follow;
}
- probe::didReceiveCORSRedirectResponse(
+ probe::didReceiveCorsRedirectResponse(
execution_context_, resource->Identifier(),
GetDocument() && GetDocument()->GetFrame()
? GetDocument()->GetFrame()->Loader().GetDocumentLoader()
@@ -650,7 +650,7 @@
if (auto error_status = cors::CheckRedirectLocation(
new_url, fetch_request_mode_, GetSecurityOrigin(),
- cors_flag_ ? CORSFlag::Set : CORSFlag::Unset)) {
+ cors_flag_ ? CorsFlag::Set : CorsFlag::Unset)) {
DispatchDidFail(ResourceError(original_url, *error_status));
return false;
}
@@ -762,7 +762,7 @@
void ThreadableLoader::HandlePreflightResponse(
const ResourceResponse& response) {
- base::Optional<network::CORSErrorStatus> cors_error_status =
+ base::Optional<network::CorsErrorStatus> cors_error_status =
cors::CheckPreflightAccess(response.Url(), response.HttpStatusCode(),
response.HttpHeaderFields(),
actual_request_.GetFetchCredentialsMode(),
@@ -772,15 +772,15 @@
return;
}
- base::Optional<network::mojom::CORSError> preflight_error =
+ base::Optional<network::mojom::CorsError> preflight_error =
cors::CheckPreflight(response.HttpStatusCode());
if (preflight_error) {
HandlePreflightFailure(response.Url(),
- network::CORSErrorStatus(*preflight_error));
+ network::CorsErrorStatus(*preflight_error));
return;
}
- base::Optional<network::CORSErrorStatus> error_status;
+ base::Optional<network::CorsErrorStatus> error_status;
if (actual_request_.IsExternalRequest()) {
error_status = cors::CheckExternalPreflight(response.HttpHeaderFields());
if (error_status) {
@@ -859,11 +859,11 @@
// We dispatch a CORS failure for the case.
// TODO(yhirano): This is probably not spec conformant. Fix it after
// https://github.com/w3c/preload/issues/100 is addressed.
- if (fetch_request_mode_ != network::mojom::FetchRequestMode::kNoCORS &&
+ if (fetch_request_mode_ != network::mojom::FetchRequestMode::kNoCors &&
response.GetType() == network::mojom::FetchResponseType::kOpaque) {
DispatchDidFail(ResourceError(
- response.Url(), network::CORSErrorStatus(
- network::mojom::CORSError::kInvalidResponse)));
+ response.Url(), network::CorsErrorStatus(
+ network::mojom::CorsError::kInvalidResponse)));
return;
}
@@ -886,7 +886,7 @@
fallback_request_for_service_worker_ = ResourceRequest();
if (cors_flag_) {
- base::Optional<network::CORSErrorStatus> access_error = cors::CheckAccess(
+ base::Optional<network::CorsErrorStatus> access_error = cors::CheckAccess(
response.Url(), response.HttpStatusCode(), response.HttpHeaderFields(),
fetch_credentials_mode_, *GetSecurityOrigin());
if (access_error) {
@@ -1008,7 +1008,7 @@
void ThreadableLoader::HandlePreflightFailure(
const KURL& url,
- const network::CORSErrorStatus& error_status) {
+ const network::CorsErrorStatus& error_status) {
// Prevent NotifyFinished() from bypassing access check.
actual_request_ = ResourceRequest();
@@ -1016,9 +1016,9 @@
}
void ThreadableLoader::DispatchDidFail(const ResourceError& error) {
- if (!out_of_blink_cors_ && error.CORSErrorStatus()) {
+ if (!out_of_blink_cors_ && error.CorsErrorStatus()) {
String message = cors::GetErrorString(
- *error.CORSErrorStatus(), initial_request_url_, last_request_url_,
+ *error.CorsErrorStatus(), initial_request_url_, last_request_url_,
*GetSecurityOrigin(), ResourceType::kRaw,
resource_loader_options_.initiator_info.name);
execution_context_->AddConsoleMessage(ConsoleMessage::Create(
@@ -1036,7 +1036,7 @@
ResourceRequest& request,
ResourceLoaderOptions resource_loader_options) {
resource_loader_options.cors_handling_by_resource_fetcher =
- kDisableCORSHandlingByResourceFetcher;
+ kDisableCorsHandlingByResourceFetcher;
if (out_of_blink_cors_) {
if (request.GetFetchCredentialsMode() ==
@@ -1048,7 +1048,7 @@
if (actual_request_.IsNull()) {
response_tainting_ = cors::CalculateResponseTainting(
request.Url(), request.GetFetchRequestMode(), GetSecurityOrigin(),
- cors_flag_ ? CORSFlag::Set : CORSFlag::Unset);
+ cors_flag_ ? CorsFlag::Set : CorsFlag::Unset);
request.SetAllowStoredCredentials(cors::CalculateCredentialsFlag(
request.GetFetchCredentialsMode(), response_tainting_));
} else {
diff --git a/third_party/blink/renderer/core/loader/threadable_loader.h b/third_party/blink/renderer/core/loader/threadable_loader.h
index 439fe892..2929062f 100644
--- a/third_party/blink/renderer/core/loader/threadable_loader.h
+++ b/third_party/blink/renderer/core/loader/threadable_loader.h
@@ -183,7 +183,7 @@
void LoadActualRequest();
// Clears actual_request_ and reports access control check failure to
// m_client.
- void HandlePreflightFailure(const KURL&, const network::CORSErrorStatus&);
+ void HandlePreflightFailure(const KURL&, const network::CorsErrorStatus&);
// Investigates the response for the preflight request. If successful,
// the actual request will be made later in NotifyFinished().
void HandlePreflightResponse(const ResourceResponse&);
@@ -216,7 +216,7 @@
// up-to-date values from them and this variable, and use it.
const ResourceLoaderOptions resource_loader_options_;
- // True when feature OutOfBlinkCORS is enabled (https://crbug.com/736308).
+ // True when feature OutOfBlinkCors is enabled (https://crbug.com/736308).
bool out_of_blink_cors_;
// Corresponds to the CORS flag in the Fetch spec.
diff --git a/third_party/blink/renderer/core/loader/threadable_loader_test.cc b/third_party/blink/renderer/core/loader/threadable_loader_test.cc
index 7a589ac6..965fb3bd 100644
--- a/third_party/blink/renderer/core/loader/threadable_loader_test.cc
+++ b/third_party/blink/renderer/core/loader/threadable_loader_test.cc
@@ -219,7 +219,7 @@
void StartLoader(const KURL& url,
network::mojom::FetchRequestMode fetch_request_mode =
- network::mojom::FetchRequestMode::kNoCORS) {
+ network::mojom::FetchRequestMode::kNoCors) {
ResourceRequest request(url);
request.SetRequestContext(mojom::RequestContextType::OBJECT);
request.SetFetchRequestMode(fetch_request_mode);
@@ -473,8 +473,8 @@
EXPECT_CALL(
*Client(),
DidFail(ResourceError(
- ErrorURL(), network::CORSErrorStatus(
- network::mojom::CORSError::kDisallowedByMode))));
+ ErrorURL(), network::CorsErrorStatus(
+ network::mojom::CorsError::kDisallowedByMode))));
EXPECT_CALL(GetCheckpoint(), Call(2));
StartLoader(ErrorURL(), network::mojom::FetchRequestMode::kSameOrigin);
@@ -522,10 +522,10 @@
EXPECT_CALL(*Client(),
DidFail(ResourceError(
SuccessURL(),
- network::CORSErrorStatus(
- network::mojom::CORSError::kMissingAllowOriginHeader))));
+ network::CorsErrorStatus(
+ network::mojom::CorsError::kMissingAllowOriginHeader))));
- StartLoader(SuccessURL(), network::mojom::FetchRequestMode::kCORS);
+ StartLoader(SuccessURL(), network::mojom::FetchRequestMode::kCors);
CallCheckpoint(2);
ServeRequests();
}
@@ -592,7 +592,7 @@
EXPECT_CALL(GetCheckpoint(), Call(2));
EXPECT_CALL(*Client(), DidFailRedirectCheck());
- StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCORS);
+ StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCors);
CallCheckpoint(2);
ServeRequests();
}
@@ -607,7 +607,7 @@
EXPECT_CALL(*Client(), DidFailRedirectCheck())
.WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::CancelLoader));
- StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCORS);
+ StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCors);
CallCheckpoint(2);
ServeRequests();
}
@@ -622,7 +622,7 @@
EXPECT_CALL(*Client(), DidFailRedirectCheck())
.WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::ClearLoader));
- StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCORS);
+ StartLoader(RedirectLoopURL(), network::mojom::FetchRequestMode::kCors);
CallCheckpoint(2);
ServeRequests();
}
@@ -642,7 +642,7 @@
// test is not saying that didFailAccessControlCheck should be dispatched
// synchronously, but is saying that even when a response is served
// synchronously it should not lead to a crash.
- StartLoader(KURL("about:blank"), network::mojom::FetchRequestMode::kCORS);
+ StartLoader(KURL("about:blank"), network::mojom::FetchRequestMode::kCors);
CallCheckpoint(2);
}
diff --git a/third_party/blink/renderer/core/paint/video_painter_test.cc b/third_party/blink/renderer/core/paint/video_painter_test.cc
index d42cc153..7a445402 100644
--- a/third_party/blink/renderer/core/paint/video_painter_test.cc
+++ b/third_party/blink/renderer/core/paint/video_painter_test.cc
@@ -26,7 +26,7 @@
const cc::Layer* GetCcLayer() { return layer_.get(); }
// WebMediaPlayer
- LoadTiming Load(LoadType, const WebMediaPlayerSource&, CORSMode) override {
+ LoadTiming Load(LoadType, const WebMediaPlayerSource&, CorsMode) override {
network_state_ = kNetworkStateLoaded;
client_->NetworkStateChanged();
ready_state_ = kReadyStateHaveEnoughData;
diff --git a/third_party/blink/renderer/core/probe/core_probes.json5 b/third_party/blink/renderer/core/probe/core_probes.json5
index f95bfba5..f295c86 100644
--- a/third_party/blink/renderer/core/probe/core_probes.json5
+++ b/third_party/blink/renderer/core/probe/core_probes.json5
@@ -123,7 +123,7 @@
"didFailLoading",
"didFinishLoading",
"didFinishXHR",
- "didReceiveCORSRedirectResponse",
+ "didReceiveCorsRedirectResponse",
"didReceiveData",
"didReceiveBlob",
"didReceiveEncodedDataLength",
@@ -139,7 +139,7 @@
"scriptImported",
"shouldBlockRequest",
"shouldBypassServiceWorker",
- "shouldForceCORSPreflight",
+ "shouldForceCorsPreflight",
"willDispatchEventSourceEvent",
"willLoadXHR",
"willSendEventSourceRequest",
diff --git a/third_party/blink/renderer/core/probe/core_probes.pidl b/third_party/blink/renderer/core/probe/core_probes.pidl
index 4b743cf..743bdfa 100644
--- a/third_party/blink/renderer/core/probe/core_probes.pidl
+++ b/third_party/blink/renderer/core/probe/core_probes.pidl
@@ -98,7 +98,7 @@
void didReceiveBlob(ExecutionContext*, unsigned long identifier, DocumentLoader*, BlobDataHandle*);
void didReceiveEncodedDataLength(ExecutionContext*, DocumentLoader* loader, unsigned long identifier, int encodedDataLength);
void didFinishLoading(ExecutionContext*, unsigned long identifier, DocumentLoader*, TimeTicks finishTime, int64_t encoded_data_length, int64_t decodedBodyLength, bool should_report_corb_blocking);
- void didReceiveCORSRedirectResponse(ExecutionContext*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, Resource*);
+ void didReceiveCorsRedirectResponse(ExecutionContext*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, Resource*);
void didFailLoading(ExecutionContext*, unsigned long identifier, DocumentLoader*, const ResourceError&);
void willSendEventSourceRequest(ExecutionContext*, ThreadableLoaderClient* eventSource);
void willDispatchEventSourceEvent(ExecutionContext*, unsigned long identifier, const AtomicString& eventName, const AtomicString& eventId, const String& data);
@@ -151,7 +151,7 @@
V8Compile([Keep] ExecutionContext* context, const String& file_name, int line, int column);
ParseHTML(Document* document, HTMLDocumentParser* parser);
void forcePseudoState([Keep] Element* element, CSSSelector::PseudoType pseudoState, bool* result);
- void shouldForceCORSPreflight(ExecutionContext*, bool* result);
+ void shouldForceCorsPreflight(ExecutionContext*, bool* result);
void shouldBlockRequest(ExecutionContext*, const KURL&, bool* result);
void shouldBypassServiceWorker(ExecutionContext* context, bool* result);
void consoleTimeStamp(ExecutionContext*, const String& title);
diff --git a/third_party/blink/renderer/core/script/classic_pending_script.cc b/third_party/blink/renderer/core/script/classic_pending_script.cc
index e7de65d..57ebf222 100644
--- a/third_party/blink/renderer/core/script/classic_pending_script.cc
+++ b/third_party/blink/renderer/core/script/classic_pending_script.cc
@@ -362,7 +362,7 @@
// ... the URL from which the script was obtained, ...</spec>
const KURL& base_url = source_code.Url();
return ClassicScript::Create(source_code, base_url, options_,
- resource->GetResponse().IsCORSSameOrigin()
+ resource->GetResponse().IsCorsSameOrigin()
? SanitizeScriptErrors::kDoNotSanitize
: SanitizeScriptErrors::kSanitize);
}
diff --git a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
index c2532299..10b9095 100644
--- a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
+++ b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
@@ -1040,16 +1040,16 @@
// in case the upload listeners are added after the request is started.
upload_events_allowed_ =
same_origin_request_ || upload_events ||
- !cors::IsCORSSafelistedMethod(method_) ||
- !cors::ContainsOnlyCORSSafelistedHeaders(request_headers_);
+ !cors::IsCorsSafelistedMethod(method_) ||
+ !cors::ContainsOnlyCorsSafelistedHeaders(request_headers_);
ResourceRequest request(url_);
request.SetRequestorOrigin(GetSecurityOrigin());
request.SetHTTPMethod(method_);
request.SetRequestContext(mojom::RequestContextType::XML_HTTP_REQUEST);
request.SetFetchRequestMode(
- upload_events ? network::mojom::FetchRequestMode::kCORSWithForcedPreflight
- : network::mojom::FetchRequestMode::kCORS);
+ upload_events ? network::mojom::FetchRequestMode::kCorsWithForcedPreflight
+ : network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(
with_credentials_ ? network::mojom::FetchCredentialsMode::kInclude
: network::mojom::FetchCredentialsMode::kSameOrigin);
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
index 9d2bb78..00e7ee9 100644
--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
@@ -96,7 +96,7 @@
resource_request.SetPriority(ResourceLoadPriority::kMedium);
resource_request.SetKeepalive(true);
resource_request.SetFetchRequestMode(
- network::mojom::FetchRequestMode::kNoCORS);
+ network::mojom::FetchRequestMode::kNoCors);
resource_request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kInclude);
resource_request.SetSkipServiceWorker(true);
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
index af2f276..8658e4a 100644
--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
@@ -216,7 +216,7 @@
// https://wicg.github.io/background-fetch/#dom-backgroundfetchmanager-fetch
// ""If |internalRequest|’s mode is "no-cors", then return a promise
// rejected with a TypeError.""
- if (web_request.Mode() == network::mojom::FetchRequestMode::kNoCORS) {
+ if (web_request.Mode() == network::mojom::FetchRequestMode::kNoCors) {
return RejectWithTypeError(script_state, request_url,
"the request mode must not be no-cors");
}
diff --git a/third_party/blink/renderer/modules/beacon/navigator_beacon.cc b/third_party/blink/renderer/modules/beacon/navigator_beacon.cc
index 244c6a95..3ccde42 100644
--- a/third_party/blink/renderer/modules/beacon/navigator_beacon.cc
+++ b/third_party/blink/renderer/modules/beacon/navigator_beacon.cc
@@ -88,7 +88,7 @@
data.GetAsArrayBufferView().View());
} else if (data.IsBlob()) {
Blob* blob = data.GetAsBlob();
- if (!cors::IsCORSSafelistedContentType(blob->type())) {
+ if (!cors::IsCorsSafelistedContentType(blob->type())) {
UseCounter::Count(context,
WebFeature::kSendBeaconWithNonSimpleContentType);
if (RuntimeEnabledFeatures::
diff --git a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
index 502c03b3..a711d4b 100644
--- a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
+++ b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
@@ -177,7 +177,7 @@
switch (type) {
case network::mojom::FetchResponseType::kBasic:
return protocol::CacheStorage::CachedResponseTypeEnum::Basic;
- case network::mojom::FetchResponseType::kCORS:
+ case network::mojom::FetchResponseType::kCors:
return protocol::CacheStorage::CachedResponseTypeEnum::Cors;
case network::mojom::FetchResponseType::kDefault:
return protocol::CacheStorage::CachedResponseTypeEnum::Default;
diff --git a/third_party/blink/renderer/modules/encryptedmedia/html_media_element_encrypted_media.cc b/third_party/blink/renderer/modules/encryptedmedia/html_media_element_encrypted_media.cc
index 4ea8019b..0c579159 100644
--- a/third_party/blink/renderer/modules/encryptedmedia/html_media_element_encrypted_media.cc
+++ b/third_party/blink/renderer/modules/encryptedmedia/html_media_element_encrypted_media.cc
@@ -409,7 +409,7 @@
DVLOG(EME_LOG_LEVEL) << __func__;
Event* event;
- if (media_element_->IsMediaDataCORSSameOrigin()) {
+ if (media_element_->IsMediaDataCorsSameOrigin()) {
event = CreateEncryptedEvent(init_data_type, init_data, init_data_length);
} else {
// Current page is not allowed to see content from the media file,
diff --git a/third_party/blink/renderer/modules/eventsource/event_source.cc b/third_party/blink/renderer/modules/eventsource/event_source.cc
index 750c1f20..3ffc70d 100644
--- a/third_party/blink/renderer/modules/eventsource/event_source.cc
+++ b/third_party/blink/renderer/modules/eventsource/event_source.cc
@@ -128,15 +128,15 @@
request.SetHTTPHeaderField(http_names::kAccept, "text/event-stream");
request.SetHTTPHeaderField(http_names::kCacheControl, "no-cache");
request.SetRequestContext(mojom::RequestContextType::EVENT_SOURCE);
- request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCORS);
+ request.SetFetchRequestMode(network::mojom::FetchRequestMode::kCors);
request.SetFetchCredentialsMode(
with_credentials_ ? network::mojom::FetchCredentialsMode::kInclude
: network::mojom::FetchCredentialsMode::kSameOrigin);
request.SetCacheMode(blink::mojom::FetchCacheMode::kNoStore);
request.SetExternalRequestStateFromRequestorAddressSpace(
execution_context.GetSecurityContext().AddressSpace());
- request.SetCORSPreflightPolicy(
- network::mojom::CORSPreflightPolicy::kPreventPreflight);
+ request.SetCorsPreflightPolicy(
+ network::mojom::CorsPreflightPolicy::kPreventPreflight);
if (parser_ && !parser_->LastEventId().IsEmpty()) {
// HTTP headers are Latin-1 byte strings, but the Last-Event-ID header is
// encoded as UTF-8.
diff --git a/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc b/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
index a04a194..d993c18 100644
--- a/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
+++ b/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
@@ -125,7 +125,7 @@
sources_.insert(track->Component()->Source());
if (!media_element_->currentSrc().IsEmpty() &&
- !media_element_->IsMediaDataCORSSameOrigin()) {
+ !media_element_->IsMediaDataCorsSameOrigin()) {
for (auto source : sources_)
MediaStreamCenter::Instance().DidStopMediaStreamSource(source);
}
@@ -155,7 +155,7 @@
}
ExecutionContext* context = ExecutionContext::From(script_state);
- if (!element.currentSrc().IsEmpty() && !element.IsMediaDataCORSSameOrigin()) {
+ if (!element.currentSrc().IsEmpty() && !element.IsMediaDataCorsSameOrigin()) {
exception_state.ThrowSecurityError(
"Cannot capture from element with cross-origin data");
return nullptr;
diff --git a/third_party/blink/renderer/modules/payments/payment_handler_utils.cc b/third_party/blink/renderer/modules/payments/payment_handler_utils.cc
index 7a571d4..215faa2 100644
--- a/third_party/blink/renderer/modules/payments/payment_handler_utils.cc
+++ b/third_party/blink/renderer/modules/payments/payment_handler_utils.cc
@@ -43,7 +43,7 @@
case ServiceWorkerResponseError::kBodyLocked:
case ServiceWorkerResponseError::kRedirectedResponseForNotFollowRequest:
case ServiceWorkerResponseError::kDataPipeCreationFailed:
- case ServiceWorkerResponseError::kResponseTypeCORSForRequestModeSameOrigin:
+ case ServiceWorkerResponseError::kResponseTypeCorsForRequestModeSameOrigin:
case ServiceWorkerResponseError::kResponseBodyBroken:
NOTREACHED();
error_message = error_message + "an unexpected error occurred.";
diff --git a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc
index 7860b3b..ea94c36 100644
--- a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc
+++ b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc
@@ -79,7 +79,7 @@
"an \"opaqueredirect\" type response was used for a "
"request whose redirect mode is not \"manual\".";
break;
- case ServiceWorkerResponseError::kResponseTypeCORSForRequestModeSameOrigin:
+ case ServiceWorkerResponseError::kResponseTypeCorsForRequestModeSameOrigin:
error_message = error_message +
"a \"cors\" type response was used for a request whose "
"mode is \"same-origin\".";
@@ -252,14 +252,14 @@
OnResponseRejected(ServiceWorkerResponseError::kResponseTypeError);
return;
}
- if (response_type == network::mojom::FetchResponseType::kCORS &&
+ if (response_type == network::mojom::FetchResponseType::kCors &&
request_mode_ == network::mojom::FetchRequestMode::kSameOrigin) {
OnResponseRejected(
- ServiceWorkerResponseError::kResponseTypeCORSForRequestModeSameOrigin);
+ ServiceWorkerResponseError::kResponseTypeCorsForRequestModeSameOrigin);
return;
}
if (response_type == network::mojom::FetchResponseType::kOpaque) {
- if (request_mode_ != network::mojom::FetchRequestMode::kNoCORS) {
+ if (request_mode_ != network::mojom::FetchRequestMode::kNoCors) {
OnResponseRejected(ServiceWorkerResponseError::kResponseTypeOpaque);
return;
}
diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
index b590aeb..62ed5e5 100644
--- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
@@ -88,7 +88,7 @@
bool is_tainted = WouldTaintOrigin();
if (is_tainted) {
- PrintCORSMessage(MediaElement()->currentSrc().GetString());
+ PrintCorsMessage(MediaElement()->currentSrc().GetString());
}
if (number_of_channels != source_number_of_channels_ ||
@@ -139,7 +139,7 @@
return MediaElement()->GetWebMediaPlayer()->WouldTaintOrigin();
}
-void MediaElementAudioSourceHandler::PrintCORSMessage(const String& message) {
+void MediaElementAudioSourceHandler::PrintCorsMessage(const String& message) {
if (Context()->GetExecutionContext()) {
Context()->GetExecutionContext()->AddConsoleMessage(
ConsoleMessage::Create(kSecurityMessageSource, kInfoMessageLevel,
diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
index bd93a8f7..2e69e1a 100644
--- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
+++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
@@ -84,7 +84,7 @@
// Print warning if CORS restrictions cause MediaElementAudioSource to output
// zeroes.
- void PrintCORSMessage(const String& message);
+ void PrintCorsMessage(const String& message);
// This Persistent doesn't make a reference cycle. The reference from
// HTMLMediaElement to AudioSourceProvideClient, which
diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
index 5ba9026..505903e 100644
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -84,8 +84,8 @@
RuntimeEnabledFeatures::SetOriginTrialControlledFeaturesEnabled(enable);
}
-void WebRuntimeFeatures::EnableOutOfBlinkCORS(bool enable) {
- RuntimeEnabledFeatures::SetOutOfBlinkCORSEnabled(enable);
+void WebRuntimeFeatures::EnableOutOfBlinkCors(bool enable) {
+ RuntimeEnabledFeatures::SetOutOfBlinkCorsEnabled(enable);
}
void WebRuntimeFeatures::EnableAccelerated2dCanvas(bool enable) {
diff --git a/third_party/blink/renderer/platform/exported/web_service_worker_request.cc b/third_party/blink/renderer/platform/exported/web_service_worker_request.cc
index 098272c..cb9afea 100644
--- a/third_party/blink/renderer/platform/exported/web_service_worker_request.cc
+++ b/third_party/blink/renderer/platform/exported/web_service_worker_request.cc
@@ -25,7 +25,7 @@
scoped_refptr<BlobDataHandle> blob_data_handle;
Referrer referrer_;
network::mojom::FetchRequestMode mode_ =
- network::mojom::FetchRequestMode::kNoCORS;
+ network::mojom::FetchRequestMode::kNoCors;
bool is_main_resource_load_ = false;
network::mojom::FetchCredentialsMode credentials_mode_ =
network::mojom::FetchCredentialsMode::kOmit;
diff --git a/third_party/blink/renderer/platform/exported/web_url_error.cc b/third_party/blink/renderer/platform/exported/web_url_error.cc
index 488a6e3..9bc40c7 100644
--- a/third_party/blink/renderer/platform/exported/web_url_error.cc
+++ b/third_party/blink/renderer/platform/exported/web_url_error.cc
@@ -27,7 +27,7 @@
DCHECK_NE(reason_, 0);
}
-WebURLError::WebURLError(const network::CORSErrorStatus& cors_error_status,
+WebURLError::WebURLError(const network::CorsErrorStatus& cors_error_status,
HasCopyInCache has_copy_in_cache,
const WebURL& url)
: reason_(net::ERR_FAILED),
diff --git a/third_party/blink/renderer/platform/exported/web_url_request.cc b/third_party/blink/renderer/platform/exported/web_url_request.cc
index 4c89398..3dffc2b 100644
--- a/third_party/blink/renderer/platform/exported/web_url_request.cc
+++ b/third_party/blink/renderer/platform/exported/web_url_request.cc
@@ -380,9 +380,9 @@
return resource_request_->IsExternalRequest();
}
-network::mojom::CORSPreflightPolicy WebURLRequest::GetCORSPreflightPolicy()
+network::mojom::CorsPreflightPolicy WebURLRequest::GetCorsPreflightPolicy()
const {
- return resource_request_->CORSPreflightPolicy();
+ return resource_request_->CorsPreflightPolicy();
}
void WebURLRequest::SetNavigationStartTime(
diff --git a/third_party/blink/renderer/platform/loader/cors/cors.cc b/third_party/blink/renderer/platform/loader/cors/cors.cc
index c6b4166..ceab3bb 100644
--- a/third_party/blink/renderer/platform/loader/cors/cors.cc
+++ b/third_party/blink/renderer/platform/loader/cors/cors.cc
@@ -154,7 +154,7 @@
namespace cors {
-base::Optional<network::CORSErrorStatus> CheckAccess(
+base::Optional<network::CorsErrorStatus> CheckAccess(
const KURL& response_url,
const int response_status_code,
const HTTPHeaderMap& response_header,
@@ -168,7 +168,7 @@
credentials_mode, AsUrlOrigin(origin));
}
-base::Optional<network::CORSErrorStatus> CheckPreflightAccess(
+base::Optional<network::CorsErrorStatus> CheckPreflightAccess(
const KURL& response_url,
const int response_status_code,
const HTTPHeaderMap& response_header,
@@ -182,11 +182,11 @@
actual_credentials_mode, AsUrlOrigin(origin));
}
-base::Optional<network::CORSErrorStatus> CheckRedirectLocation(
+base::Optional<network::CorsErrorStatus> CheckRedirectLocation(
const KURL& url,
network::mojom::FetchRequestMode request_mode,
const SecurityOrigin* origin,
- CORSFlag cors_flag) {
+ CorsFlag cors_flag) {
base::Optional<url::Origin> origin_to_pass;
if (origin)
origin_to_pass = AsUrlOrigin(*origin);
@@ -194,25 +194,25 @@
// Blink-side implementations rewrite the origin instead of setting the
// tainted flag.
return network::cors::CheckRedirectLocation(
- url, request_mode, origin_to_pass, cors_flag == CORSFlag::Set, false);
+ url, request_mode, origin_to_pass, cors_flag == CorsFlag::Set, false);
}
-base::Optional<network::mojom::CORSError> CheckPreflight(
+base::Optional<network::mojom::CorsError> CheckPreflight(
const int preflight_response_status_code) {
return network::cors::CheckPreflight(preflight_response_status_code);
}
-base::Optional<network::CORSErrorStatus> CheckExternalPreflight(
+base::Optional<network::CorsErrorStatus> CheckExternalPreflight(
const HTTPHeaderMap& response_header) {
return network::cors::CheckExternalPreflight(
GetHeaderValue(response_header, http_names::kAccessControlAllowExternal));
}
-bool IsCORSEnabledRequestMode(network::mojom::FetchRequestMode request_mode) {
- return network::cors::IsCORSEnabledRequestMode(request_mode);
+bool IsCorsEnabledRequestMode(network::mojom::FetchRequestMode request_mode) {
+ return network::cors::IsCorsEnabledRequestMode(request_mode);
}
-base::Optional<network::CORSErrorStatus> EnsurePreflightResultAndCacheOnSuccess(
+base::Optional<network::CorsErrorStatus> EnsurePreflightResultAndCacheOnSuccess(
const HTTPHeaderMap& response_header_map,
const String& origin,
const KURL& request_url,
@@ -222,7 +222,7 @@
DCHECK(!origin.IsNull());
DCHECK(!request_method.IsNull());
- base::Optional<network::mojom::CORSError> error;
+ base::Optional<network::mojom::CorsError> error;
std::unique_ptr<network::cors::PreflightResult> result =
network::cors::PreflightResult::Create(
@@ -235,9 +235,9 @@
http_names::kAccessControlMaxAge),
&error);
if (error)
- return network::CORSErrorStatus(*error);
+ return network::CorsErrorStatus(*error);
- base::Optional<network::CORSErrorStatus> status;
+ base::Optional<network::CorsErrorStatus> status;
status = result->EnsureAllowedCrossOriginMethod(
std::string(request_method.Ascii().data()));
if (status)
@@ -276,12 +276,12 @@
const KURL& url,
network::mojom::FetchRequestMode request_mode,
const SecurityOrigin* origin,
- CORSFlag cors_flag) {
+ CorsFlag cors_flag) {
base::Optional<url::Origin> origin_to_pass;
if (origin)
origin_to_pass = AsUrlOrigin(*origin);
return network::cors::CalculateResponseTainting(
- url, request_mode, origin_to_pass, cors_flag == CORSFlag::Set);
+ url, request_mode, origin_to_pass, cors_flag == CorsFlag::Set);
}
bool CalculateCredentialsFlag(
@@ -291,24 +291,24 @@
response_tainting);
}
-bool IsCORSSafelistedMethod(const String& method) {
+bool IsCorsSafelistedMethod(const String& method) {
DCHECK(!method.IsNull());
- return network::cors::IsCORSSafelistedMethod(WebString(method).Latin1());
+ return network::cors::IsCorsSafelistedMethod(WebString(method).Latin1());
}
-bool IsCORSSafelistedContentType(const String& media_type) {
- return network::cors::IsCORSSafelistedContentType(
+bool IsCorsSafelistedContentType(const String& media_type) {
+ return network::cors::IsCorsSafelistedContentType(
WebString(media_type).Latin1());
}
-bool IsNoCORSSafelistedHeader(const String& name, const String& value) {
+bool IsNoCorsSafelistedHeader(const String& name, const String& value) {
DCHECK(!name.IsNull());
DCHECK(!value.IsNull());
- return network::cors::IsNoCORSSafelistedHeader(WebString(name).Latin1(),
+ return network::cors::IsNoCorsSafelistedHeader(WebString(name).Latin1(),
WebString(value).Latin1());
}
-Vector<String> CORSUnsafeRequestHeaderNames(const HTTPHeaderMap& headers) {
+Vector<String> CorsUnsafeRequestHeaderNames(const HTTPHeaderMap& headers) {
net::HttpRequestHeaders::HeaderVector in;
for (const auto& entry : headers) {
in.push_back(net::HttpRequestHeaders::HeaderKeyValuePair(
@@ -316,7 +316,7 @@
}
Vector<String> header_names;
- for (const auto& name : network::cors::CORSUnsafeRequestHeaderNames(in))
+ for (const auto& name : network::cors::CorsUnsafeRequestHeaderNames(in))
header_names.push_back(WebString::FromLatin1(name));
return header_names;
}
@@ -325,12 +325,12 @@
return network::cors::IsForbiddenHeader(WebString(name).Latin1());
}
-bool ContainsOnlyCORSSafelistedHeaders(const HTTPHeaderMap& header_map) {
- Vector<String> header_names = CORSUnsafeRequestHeaderNames(header_map);
+bool ContainsOnlyCorsSafelistedHeaders(const HTTPHeaderMap& header_map) {
+ Vector<String> header_names = CorsUnsafeRequestHeaderNames(header_map);
return header_names.IsEmpty();
}
-bool ContainsOnlyCORSSafelistedOrForbiddenHeaders(
+bool ContainsOnlyCorsSafelistedOrForbiddenHeaders(
const HTTPHeaderMap& headers) {
Vector<String> header_names;
@@ -341,7 +341,7 @@
}
// |is_revalidating| is not needed for blink-side CORS.
constexpr bool is_revalidating = false;
- return network::cors::CORSUnsafeNotForbiddenRequestHeaderNames(
+ return network::cors::CorsUnsafeNotForbiddenRequestHeaderNames(
in, is_revalidating)
.empty();
}
@@ -350,11 +350,11 @@
return network::cors::IsOkStatus(status);
}
-bool CalculateCORSFlag(const KURL& url,
+bool CalculateCorsFlag(const KURL& url,
const SecurityOrigin* origin,
network::mojom::FetchRequestMode request_mode) {
if (request_mode == network::mojom::FetchRequestMode::kNavigate ||
- request_mode == network::mojom::FetchRequestMode::kNoCORS) {
+ request_mode == network::mojom::FetchRequestMode::kNoCors) {
return false;
}
// CORS needs a proper origin (including a unique opaque origin). If the
@@ -408,7 +408,7 @@
// No-CORS mode is highly discouraged from using it for new features. Only
// legacy usages for backward compatibility are allowed except for well-designed
// usages over the fetch API.
-bool IsNoCORSAllowedContext(mojom::RequestContextType context) {
+bool IsNoCorsAllowedContext(mojom::RequestContextType context) {
switch (context) {
case mojom::RequestContextType::AUDIO:
case mojom::RequestContextType::FAVICON:
diff --git a/third_party/blink/renderer/platform/loader/cors/cors.h b/third_party/blink/renderer/platform/loader/cors/cors.h
index 387c2382..425930b9 100644
--- a/third_party/blink/renderer/platform/loader/cors/cors.h
+++ b/third_party/blink/renderer/platform/loader/cors/cors.h
@@ -22,7 +22,7 @@
class ResourceResponse;
class SecurityOrigin;
-enum class CORSFlag : uint8_t {
+enum class CorsFlag : uint8_t {
Unset,
Set,
};
@@ -33,35 +33,35 @@
// Thin wrapper functions below are for calling ::network::cors functions from
// Blink core. Once Out-of-renderer CORS is enabled, following functions will
// be removed.
-PLATFORM_EXPORT base::Optional<network::CORSErrorStatus> CheckAccess(
+PLATFORM_EXPORT base::Optional<network::CorsErrorStatus> CheckAccess(
const KURL&,
const int response_status_code,
const HTTPHeaderMap&,
network::mojom::FetchCredentialsMode,
const SecurityOrigin&);
-PLATFORM_EXPORT base::Optional<network::CORSErrorStatus> CheckPreflightAccess(
+PLATFORM_EXPORT base::Optional<network::CorsErrorStatus> CheckPreflightAccess(
const KURL&,
const int response_status_code,
const HTTPHeaderMap&,
network::mojom::FetchCredentialsMode,
const SecurityOrigin&);
-PLATFORM_EXPORT base::Optional<network::CORSErrorStatus> CheckRedirectLocation(
+PLATFORM_EXPORT base::Optional<network::CorsErrorStatus> CheckRedirectLocation(
const KURL&,
network::mojom::FetchRequestMode,
const SecurityOrigin*,
- CORSFlag);
+ CorsFlag);
-PLATFORM_EXPORT base::Optional<network::mojom::CORSError> CheckPreflight(
+PLATFORM_EXPORT base::Optional<network::mojom::CorsError> CheckPreflight(
const int preflight_response_status_code);
-PLATFORM_EXPORT base::Optional<network::CORSErrorStatus> CheckExternalPreflight(
+PLATFORM_EXPORT base::Optional<network::CorsErrorStatus> CheckExternalPreflight(
const HTTPHeaderMap&);
-PLATFORM_EXPORT bool IsCORSEnabledRequestMode(network::mojom::FetchRequestMode);
+PLATFORM_EXPORT bool IsCorsEnabledRequestMode(network::mojom::FetchRequestMode);
-PLATFORM_EXPORT base::Optional<network::CORSErrorStatus>
+PLATFORM_EXPORT base::Optional<network::CorsErrorStatus>
EnsurePreflightResultAndCacheOnSuccess(
const HTTPHeaderMap& response_header_map,
const String& origin,
@@ -81,7 +81,7 @@
const KURL& url,
network::mojom::FetchRequestMode request_mode,
const SecurityOrigin* origin,
- CORSFlag cors_flag);
+ CorsFlag cors_flag);
PLATFORM_EXPORT bool CalculateCredentialsFlag(
network::mojom::FetchCredentialsMode credentials_mode,
@@ -89,15 +89,15 @@
// Thin wrapper functions that will not be removed even after out-of-renderer
// CORS is enabled.
-PLATFORM_EXPORT bool IsCORSSafelistedMethod(const String& method);
-PLATFORM_EXPORT bool IsCORSSafelistedContentType(const String&);
-PLATFORM_EXPORT bool IsNoCORSSafelistedHeader(const String& name,
+PLATFORM_EXPORT bool IsCorsSafelistedMethod(const String& method);
+PLATFORM_EXPORT bool IsCorsSafelistedContentType(const String&);
+PLATFORM_EXPORT bool IsNoCorsSafelistedHeader(const String& name,
const String& value);
-PLATFORM_EXPORT Vector<String> CORSUnsafeRequestHeaderNames(
+PLATFORM_EXPORT Vector<String> CorsUnsafeRequestHeaderNames(
const HTTPHeaderMap& headers);
PLATFORM_EXPORT bool IsForbiddenHeaderName(const String& name);
-PLATFORM_EXPORT bool ContainsOnlyCORSSafelistedHeaders(const HTTPHeaderMap&);
-PLATFORM_EXPORT bool ContainsOnlyCORSSafelistedOrForbiddenHeaders(
+PLATFORM_EXPORT bool ContainsOnlyCorsSafelistedHeaders(const HTTPHeaderMap&);
+PLATFORM_EXPORT bool ContainsOnlyCorsSafelistedOrForbiddenHeaders(
const HTTPHeaderMap&);
PLATFORM_EXPORT bool IsOkStatus(int status);
@@ -106,12 +106,12 @@
// https://fetch.spec.whatwg.org/. This function is corresponding to the CORS
// flag setting logic in https://fetch.spec.whatwg.org/#main-fetch.
// This function can return true even when |request_mode| is |kSameOrigin|.
-// |origin| must not be nullptr when |request_mode| is neither |kNoCORS| nor
+// |origin| must not be nullptr when |request_mode| is neither |kNoCors| nor
// |kNavigate|.
-// This should be identical to CalculateCORSFlag defined in
+// This should be identical to CalculateCorsFlag defined in
// //services/network/cors/cors_url_loader.cc.
// This function will be removed when out-of-renderer CORS is enabled.
-PLATFORM_EXPORT bool CalculateCORSFlag(
+PLATFORM_EXPORT bool CalculateCorsFlag(
const KURL& url,
const SecurityOrigin* origin,
network::mojom::FetchRequestMode request_mode);
@@ -123,7 +123,7 @@
PLATFORM_EXPORT bool IsOnAccessControlResponseHeaderWhitelist(const String&);
// Checks whether request mode 'no-cors' is allowed for a certain context.
-PLATFORM_EXPORT bool IsNoCORSAllowedContext(mojom::RequestContextType);
+PLATFORM_EXPORT bool IsNoCorsAllowedContext(mojom::RequestContextType);
} // namespace cors
diff --git a/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc b/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
index 7e00e73..04557df 100644
--- a/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
+++ b/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
@@ -29,18 +29,18 @@
}
}
-bool IsPreflightError(network::mojom::CORSError error_code) {
+bool IsPreflightError(network::mojom::CorsError error_code) {
switch (error_code) {
- case network::mojom::CORSError::kPreflightWildcardOriginNotAllowed:
- case network::mojom::CORSError::kPreflightMissingAllowOriginHeader:
- case network::mojom::CORSError::kPreflightMultipleAllowOriginValues:
- case network::mojom::CORSError::kPreflightInvalidAllowOriginValue:
- case network::mojom::CORSError::kPreflightAllowOriginMismatch:
- case network::mojom::CORSError::kPreflightInvalidAllowCredentials:
- case network::mojom::CORSError::kPreflightInvalidStatus:
- case network::mojom::CORSError::kPreflightDisallowedRedirect:
- case network::mojom::CORSError::kPreflightMissingAllowExternal:
- case network::mojom::CORSError::kPreflightInvalidAllowExternal:
+ case network::mojom::CorsError::kPreflightWildcardOriginNotAllowed:
+ case network::mojom::CorsError::kPreflightMissingAllowOriginHeader:
+ case network::mojom::CorsError::kPreflightMultipleAllowOriginValues:
+ case network::mojom::CorsError::kPreflightInvalidAllowOriginValue:
+ case network::mojom::CorsError::kPreflightAllowOriginMismatch:
+ case network::mojom::CorsError::kPreflightInvalidAllowCredentials:
+ case network::mojom::CorsError::kPreflightInvalidStatus:
+ case network::mojom::CorsError::kPreflightDisallowedRedirect:
+ case network::mojom::CorsError::kPreflightMissingAllowExternal:
+ case network::mojom::CorsError::kPreflightInvalidAllowExternal:
return true;
default:
return false;
@@ -49,7 +49,7 @@
} // namespace
-String GetErrorString(const network::CORSErrorStatus& status,
+String GetErrorString(const network::CorsErrorStatus& status,
const KURL& initial_request_url,
const KURL& last_request_url,
const SecurityOrigin& origin,
@@ -61,7 +61,7 @@
"response serves your needs, set the request's mode to 'no-cors' to "
"fetch the resource with CORS disabled.";
- using CORSError = network::mojom::CORSError;
+ using CorsError = network::mojom::CorsError;
const StringView hint(status.failed_parameter.data(),
status.failed_parameter.size());
@@ -86,14 +86,14 @@
}
switch (status.cors_error) {
- case CORSError::kDisallowedByMode:
+ case CorsError::kDisallowedByMode:
builder.Append("Cross origin requests are not allowed by request mode.");
break;
- case CORSError::kInvalidResponse:
+ case CorsError::kInvalidResponse:
builder.Append("The response is invalid.");
break;
- case CORSError::kWildcardOriginNotAllowed:
- case CORSError::kPreflightWildcardOriginNotAllowed:
+ case CorsError::kWildcardOriginNotAllowed:
+ case CorsError::kPreflightWildcardOriginNotAllowed:
builder.Append(
"The value of the 'Access-Control-Allow-Origin' header in the "
"response must not be the wildcard '*' when the request's "
@@ -104,8 +104,8 @@
"XMLHttpRequest is controlled by the withCredentials attribute.");
}
break;
- case CORSError::kMissingAllowOriginHeader:
- case CORSError::kPreflightMissingAllowOriginHeader:
+ case CorsError::kMissingAllowOriginHeader:
+ case CorsError::kPreflightMissingAllowOriginHeader:
builder.Append(
"No 'Access-Control-Allow-Origin' header is present on the "
"requested resource.");
@@ -115,8 +115,8 @@
"mode to 'no-cors' to fetch the resource with CORS disabled.");
}
break;
- case CORSError::kMultipleAllowOriginValues:
- case CORSError::kPreflightMultipleAllowOriginValues:
+ case CorsError::kMultipleAllowOriginValues:
+ case CorsError::kPreflightMultipleAllowOriginValues:
Append(builder,
{"The 'Access-Control-Allow-Origin' header contains multiple "
"values '",
@@ -124,23 +124,23 @@
if (initiator_name == fetch_initiator_type_names::kFetch)
builder.Append(kNoCorsInformation);
break;
- case CORSError::kInvalidAllowOriginValue:
- case CORSError::kPreflightInvalidAllowOriginValue:
+ case CorsError::kInvalidAllowOriginValue:
+ case CorsError::kPreflightInvalidAllowOriginValue:
Append(builder, {"The 'Access-Control-Allow-Origin' header contains the "
"invalid value '",
hint, "'."});
if (initiator_name == fetch_initiator_type_names::kFetch)
builder.Append(kNoCorsInformation);
break;
- case CORSError::kAllowOriginMismatch:
- case CORSError::kPreflightAllowOriginMismatch:
+ case CorsError::kAllowOriginMismatch:
+ case CorsError::kPreflightAllowOriginMismatch:
Append(builder, {"The 'Access-Control-Allow-Origin' header has a value '",
hint, "' that is not equal to the supplied origin."});
if (initiator_name == fetch_initiator_type_names::kFetch)
builder.Append(kNoCorsInformation);
break;
- case CORSError::kInvalidAllowCredentials:
- case CORSError::kPreflightInvalidAllowCredentials:
+ case CorsError::kInvalidAllowCredentials:
+ case CorsError::kPreflightInvalidAllowCredentials:
Append(builder,
{"The value of the 'Access-Control-Allow-Credentials' header in "
"the response is '",
@@ -154,25 +154,25 @@
"attribute.");
}
break;
- case CORSError::kCORSDisabledScheme:
+ case CorsError::kCorsDisabledScheme:
Append(builder,
{"Cross origin requests are only supported for protocol schemes: ",
- SchemeRegistry::ListOfCORSEnabledURLSchemes(), "."});
+ SchemeRegistry::ListOfCorsEnabledURLSchemes(), "."});
break;
- case CORSError::kPreflightInvalidStatus:
+ case CorsError::kPreflightInvalidStatus:
builder.Append("It does not have HTTP ok status.");
break;
- case CORSError::kPreflightDisallowedRedirect:
+ case CorsError::kPreflightDisallowedRedirect:
builder.Append("Redirect is not allowed for a preflight request.");
break;
- case CORSError::kPreflightMissingAllowExternal:
+ case CorsError::kPreflightMissingAllowExternal:
builder.Append(
"No 'Access-Control-Allow-External' header was present in the "
"preflight response for this external request (This is an "
"experimental header which is defined in "
"'https://wicg.github.io/cors-rfc1918/').");
break;
- case CORSError::kPreflightInvalidAllowExternal:
+ case CorsError::kPreflightInvalidAllowExternal:
Append(builder,
{"The 'Access-Control-Allow-External' header in the preflight "
"response for this external request had a value of '",
@@ -180,27 +180,27 @@
"', not 'true' (This is an experimental header which is defined "
"in 'https://wicg.github.io/cors-rfc1918/')."});
break;
- case CORSError::kInvalidAllowMethodsPreflightResponse:
+ case CorsError::kInvalidAllowMethodsPreflightResponse:
builder.Append(
"Cannot parse Access-Control-Allow-Methods response header field in "
"preflight response.");
break;
- case CORSError::kInvalidAllowHeadersPreflightResponse:
+ case CorsError::kInvalidAllowHeadersPreflightResponse:
builder.Append(
"Cannot parse Access-Control-Allow-Headers response header field in "
"preflight response.");
break;
- case CORSError::kMethodDisallowedByPreflightResponse:
+ case CorsError::kMethodDisallowedByPreflightResponse:
Append(builder, {"Method ", hint,
" is not allowed by Access-Control-Allow-Methods in "
"preflight response."});
break;
- case CORSError::kHeaderDisallowedByPreflightResponse:
+ case CorsError::kHeaderDisallowedByPreflightResponse:
Append(builder, {"Request header field ", hint,
" is not allowed by "
"Access-Control-Allow-Headers in preflight response."});
break;
- case CORSError::kRedirectContainsCredentials:
+ case CorsError::kRedirectContainsCredentials:
Append(builder, {"Redirect location '", hint,
"' contains a username and password, which is "
"disallowed for cross-origin requests."});
diff --git a/third_party/blink/renderer/platform/loader/cors/cors_error_string.h b/third_party/blink/renderer/platform/loader/cors/cors_error_string.h
index 45aca5d..f9e8664f1 100644
--- a/third_party/blink/renderer/platform/loader/cors/cors_error_string.h
+++ b/third_party/blink/renderer/platform/loader/cors/cors_error_string.h
@@ -21,9 +21,9 @@
// CORS error strings related utility functions.
namespace cors {
-// Stringify CORSError mainly for inspector messages. Generated string should
+// Stringify CorsError mainly for inspector messages. Generated string should
// not be exposed to JavaScript for security reasons.
-PLATFORM_EXPORT String GetErrorString(const network::CORSErrorStatus& status,
+PLATFORM_EXPORT String GetErrorString(const network::CorsErrorStatus& status,
const KURL& initial_request_url,
const KURL& last_request_url,
const SecurityOrigin& origin,
diff --git a/third_party/blink/renderer/platform/loader/cors/cors_test.cc b/third_party/blink/renderer/platform/loader/cors/cors_test.cc
index 9a6062e..718a51f 100644
--- a/third_party/blink/renderer/platform/loader/cors/cors_test.cc
+++ b/third_party/blink/renderer/platform/loader/cors/cors_test.cc
@@ -11,7 +11,7 @@
namespace {
-class CORSExposedHeadersTest : public testing::Test {
+class CorsExposedHeadersTest : public testing::Test {
public:
using CredentialsMode = network::mojom::FetchCredentialsMode;
@@ -24,7 +24,7 @@
}
};
-TEST_F(CORSExposedHeadersTest, ValidInput) {
+TEST_F(CorsExposedHeadersTest, ValidInput) {
EXPECT_EQ(Parse(CredentialsMode::kOmit, "valid"),
WebHTTPHeaderSet({"valid"}));
@@ -37,14 +37,14 @@
WebHTTPHeaderSet({"a"}));
}
-TEST_F(CORSExposedHeadersTest, DuplicatedEntries) {
+TEST_F(CorsExposedHeadersTest, DuplicatedEntries) {
EXPECT_EQ(Parse(CredentialsMode::kOmit, "a, a"), WebHTTPHeaderSet{"a"});
EXPECT_EQ(Parse(CredentialsMode::kOmit, "a, a, b"),
WebHTTPHeaderSet({"a", "b"}));
}
-TEST_F(CORSExposedHeadersTest, InvalidInput) {
+TEST_F(CorsExposedHeadersTest, InvalidInput) {
EXPECT_TRUE(Parse(CredentialsMode::kOmit, "not valid").empty());
EXPECT_TRUE(Parse(CredentialsMode::kOmit, "///").empty());
@@ -69,7 +69,7 @@
.empty());
}
-TEST_F(CORSExposedHeadersTest, Wildcard) {
+TEST_F(CorsExposedHeadersTest, Wildcard) {
ResourceResponse response;
response.AddHTTPHeaderField("access-control-expose-headers", "a, b, *");
response.AddHTTPHeaderField("b", "-");
@@ -87,7 +87,7 @@
WebHTTPHeaderSet({"access-control-expose-headers", "b", "c", "d", "*"}));
}
-TEST_F(CORSExposedHeadersTest, Asterisk) {
+TEST_F(CorsExposedHeadersTest, Asterisk) {
ResourceResponse response;
response.AddHTTPHeaderField("access-control-expose-headers", "a, b, *");
response.AddHTTPHeaderField("b", "-");
diff --git a/third_party/blink/renderer/platform/loader/fetch/fetch_parameters.cc b/third_party/blink/renderer/platform/loader/fetch/fetch_parameters.cc
index d704559..497d88b 100644
--- a/third_party/blink/renderer/platform/loader/fetch/fetch_parameters.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/fetch_parameters.cc
@@ -75,7 +75,7 @@
// Currently FetchParametersMode is only used when the request goes to
// Service Worker.
resource_request_.SetFetchRequestMode(
- network::mojom::FetchRequestMode::kCORS);
+ network::mojom::FetchRequestMode::kCors);
resource_request_.SetFetchCredentialsMode(credentials_mode);
resource_request_.SetRequestorOrigin(origin);
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource.cc b/third_party/blink/renderer/platform/loader/fetch/resource.cc
index 192d1cd..a2b6cf2 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource.cc
@@ -809,7 +809,7 @@
if (GetResponse().WasFetchedViaServiceWorker() &&
GetResponse().GetType() == network::mojom::FetchResponseType::kOpaque &&
new_request.GetFetchRequestMode() !=
- network::mojom::FetchRequestMode::kNoCORS) {
+ network::mojom::FetchRequestMode::kNoCors) {
return MatchStatus::kUnknownFailure;
}
@@ -895,13 +895,13 @@
return MatchStatus::kRequestModeDoesNotMatch;
switch (new_mode) {
- case network::mojom::FetchRequestMode::kNoCORS:
+ case network::mojom::FetchRequestMode::kNoCors:
case network::mojom::FetchRequestMode::kNavigate:
break;
- case network::mojom::FetchRequestMode::kCORS:
+ case network::mojom::FetchRequestMode::kCors:
case network::mojom::FetchRequestMode::kSameOrigin:
- case network::mojom::FetchRequestMode::kCORSWithForcedPreflight:
+ case network::mojom::FetchRequestMode::kCorsWithForcedPreflight:
// We have two separate CORS handling logics in ThreadableLoader
// and ResourceLoader and sharing resources is difficult when they are
// handled differently.
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_error.cc b/third_party/blink/renderer/platform/loader/fetch/resource_error.cc
index 1670ba04..ca115e69 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_error.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_error.cc
@@ -84,7 +84,7 @@
ResourceError::ResourceError(
int error_code,
const KURL& url,
- base::Optional<network::CORSErrorStatus> cors_error_status)
+ base::Optional<network::CorsErrorStatus> cors_error_status)
: error_code_(error_code),
failing_url_(url),
is_access_check_(cors_error_status.has_value()),
@@ -94,7 +94,7 @@
}
ResourceError::ResourceError(const KURL& url,
- const network::CORSErrorStatus& cors_error_status)
+ const network::CorsErrorStatus& cors_error_status)
: ResourceError(net::ERR_FAILED, url, cors_error_status) {}
ResourceError::ResourceError(const WebURLError& error)
@@ -151,7 +151,7 @@
if (a.HasCopyInCache() != b.HasCopyInCache())
return false;
- if (a.CORSErrorStatus() != b.CORSErrorStatus())
+ if (a.CorsErrorStatus() != b.CorsErrorStatus())
return false;
if (a.extended_error_code_ != b.extended_error_code_)
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_error.h b/third_party/blink/renderer/platform/loader/fetch/resource_error.h
index 8917c2f..b50e630 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_error.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_error.h
@@ -63,9 +63,9 @@
// |error_code| must not be 0.
ResourceError(int error_code,
const KURL& failing_url,
- base::Optional<network::CORSErrorStatus>);
+ base::Optional<network::CorsErrorStatus>);
ResourceError(const KURL& failing_url,
- const network::CORSErrorStatus& status);
+ const network::CorsErrorStatus& status);
ResourceError(const WebURLError&);
// Makes a deep copy. Useful for when you need to use a ResourceError on
@@ -86,7 +86,7 @@
base::Optional<ResourceRequestBlockedReason> GetResourceRequestBlockedReason()
const;
- base::Optional<network::CORSErrorStatus> CORSErrorStatus() const {
+ base::Optional<network::CorsErrorStatus> CorsErrorStatus() const {
return cors_error_status_;
}
@@ -107,7 +107,7 @@
bool is_access_check_ = false;
bool has_copy_in_cache_ = false;
bool blocked_by_subresource_filter_ = false;
- base::Optional<network::CORSErrorStatus> cors_error_status_;
+ base::Optional<network::CorsErrorStatus> cors_error_status_;
};
inline bool operator==(const ResourceError& a, const ResourceError& b) {
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
index 0dccfd51..be092d8 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -788,13 +788,13 @@
if (!params.Url().IsValid())
return ResourceRequestBlockedReason::kOther;
- if (!RuntimeEnabledFeatures::OutOfBlinkCORSEnabled() &&
+ if (!RuntimeEnabledFeatures::OutOfBlinkCorsEnabled() &&
options.cors_handling_by_resource_fetcher ==
- kEnableCORSHandlingByResourceFetcher) {
+ kEnableCorsHandlingByResourceFetcher) {
const scoped_refptr<const SecurityOrigin> origin =
resource_request.RequestorOrigin();
DCHECK(!options.cors_flag);
- params.MutableOptions().cors_flag = cors::CalculateCORSFlag(
+ params.MutableOptions().cors_flag = cors::CalculateCorsFlag(
params.Url(), origin.get(), resource_request.GetFetchRequestMode());
// TODO(yhirano): Reject requests for non CORS-enabled schemes.
// See https://crrev.com/c/1298828.
@@ -802,10 +802,10 @@
resource_request.GetFetchCredentialsMode(),
cors::CalculateResponseTainting(
params.Url(), resource_request.GetFetchRequestMode(), origin.get(),
- params.Options().cors_flag ? CORSFlag::Set : CORSFlag::Unset)));
+ params.Options().cors_flag ? CorsFlag::Set : CorsFlag::Unset)));
}
- if (RuntimeEnabledFeatures::OutOfBlinkCORSEnabled() &&
+ if (RuntimeEnabledFeatures::OutOfBlinkCorsEnabled() &&
resource_request.GetFetchCredentialsMode() ==
network::mojom::FetchCredentialsMode::kOmit) {
// See comments at network::ResourceRequest::fetch_credentials_mode.
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc
index 9945505f..3198a25 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc
@@ -389,11 +389,11 @@
throttle_option = ResourceLoadScheduler::ThrottleOption::kStoppable;
}
- if (ShouldCheckCORSInResourceLoader()) {
+ if (ShouldCheckCorsInResourceLoader()) {
const auto origin = resource_->GetOrigin();
response_tainting_ = cors::CalculateResponseTainting(
request.Url(), request.GetFetchRequestMode(), origin.get(),
- GetCORSFlag() ? CORSFlag::Set : CORSFlag::Unset);
+ GetCorsFlag() ? CorsFlag::Set : CorsFlag::Unset);
}
if (request.IsAutomaticUpgrade()) {
@@ -610,13 +610,13 @@
return false;
}
- if (ShouldCheckCORSInResourceLoader()) {
+ if (ShouldCheckCorsInResourceLoader()) {
scoped_refptr<const SecurityOrigin> origin = resource_->GetOrigin();
- base::Optional<network::CORSErrorStatus> cors_error =
+ base::Optional<network::CorsErrorStatus> cors_error =
cors::CheckRedirectLocation(
new_url, fetch_request_mode, origin.get(),
- GetCORSFlag() ? CORSFlag::Set : CORSFlag::Unset);
- if (!cors_error && GetCORSFlag()) {
+ GetCorsFlag() ? CorsFlag::Set : CorsFlag::Unset);
+ if (!cors_error && GetCorsFlag()) {
cors_error =
cors::CheckAccess(new_url, redirect_response.HttpStatusCode(),
redirect_response.HttpHeaderFields(),
@@ -652,7 +652,7 @@
cross_origin);
base::Optional<ResourceResponse> redirect_response_with_type;
- if (ShouldCheckCORSInResourceLoader()) {
+ if (ShouldCheckCorsInResourceLoader()) {
new_request->SetAllowStoredCredentials(cors::CalculateCredentialsFlag(
fetch_credentials_mode, response_tainting_));
if (!redirect_response.WasFetchedViaServiceWorker()) {
@@ -717,24 +717,24 @@
return false;
}
- if (ShouldCheckCORSInResourceLoader()) {
+ if (ShouldCheckCorsInResourceLoader()) {
bool new_cors_flag =
- GetCORSFlag() || cors::CalculateCORSFlag(new_request->Url(),
+ GetCorsFlag() || cors::CalculateCorsFlag(new_request->Url(),
resource_->GetOrigin().get(),
fetch_request_mode);
resource_->MutableOptions().cors_flag = new_cors_flag;
// Cross-origin requests are only allowed certain registered schemes.
- if (GetCORSFlag() && !SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(
+ if (GetCorsFlag() && !SchemeRegistry::ShouldTreatURLSchemeAsCorsEnabled(
new_request->Url().Protocol())) {
HandleError(
ResourceError(new_request->Url(),
- network::CORSErrorStatus(
- network::mojom::CORSError::kCORSDisabledScheme)));
+ network::CorsErrorStatus(
+ network::mojom::CorsError::kCorsDisabledScheme)));
return false;
}
response_tainting_ = cors::CalculateResponseTainting(
new_request->Url(), fetch_request_mode, resource_->GetOrigin().get(),
- GetCORSFlag() ? CORSFlag::Set : CORSFlag::Unset);
+ GetCorsFlag() ? CorsFlag::Set : CorsFlag::Unset);
}
report_raw_headers = new_request->ReportRawHeaders();
@@ -827,8 +827,8 @@
if (response.WasFetchedViaServiceWorker()) {
if (options.cors_handling_by_resource_fetcher ==
- kEnableCORSHandlingByResourceFetcher &&
- fetch_request_mode == network::mojom::FetchRequestMode::kCORS &&
+ kEnableCorsHandlingByResourceFetcher &&
+ fetch_request_mode == network::mojom::FetchRequestMode::kCors &&
response.WasFallbackRequiredByServiceWorker()) {
ResourceRequest last_request = resource_->LastResourceRequest();
DCHECK(!last_request.GetSkipServiceWorker());
@@ -871,11 +871,11 @@
}
base::Optional<ResourceResponse> response_with_type;
- if (ShouldCheckCORSInResourceLoader() &&
+ if (ShouldCheckCorsInResourceLoader() &&
!response.WasFetchedViaServiceWorker() &&
!(resource_->IsCacheValidator() && response.HttpStatusCode() == 304)) {
- if (GetCORSFlag()) {
- base::Optional<network::CORSErrorStatus> cors_error = cors::CheckAccess(
+ if (GetCorsFlag()) {
+ base::Optional<network::CorsErrorStatus> cors_error = cors::CheckAccess(
response.Url(), response.HttpStatusCode(),
response.HttpHeaderFields(),
initial_request.GetFetchCredentialsMode(), *resource_->GetOrigin());
@@ -1029,10 +1029,10 @@
Restart(resource_->GetResourceRequest());
return;
}
- if (error.CORSErrorStatus()) {
+ if (error.CorsErrorStatus()) {
Context().AddErrorConsoleMessage(
cors::GetErrorString(
- *error.CORSErrorStatus(), resource_->GetResourceRequest().Url(),
+ *error.CorsErrorStatus(), resource_->GetResourceRequest().Url(),
resource_->LastResourceRequest().Url(), *resource_->GetOrigin(),
resource_->GetType(), resource_->Options().initiator_info.name),
FetchContext::kJSSource);
@@ -1218,10 +1218,10 @@
return base::nullopt;
}
-bool ResourceLoader::ShouldCheckCORSInResourceLoader() const {
- return !RuntimeEnabledFeatures::OutOfBlinkCORSEnabled() &&
+bool ResourceLoader::ShouldCheckCorsInResourceLoader() const {
+ return !RuntimeEnabledFeatures::OutOfBlinkCorsEnabled() &&
resource_->Options().cors_handling_by_resource_fetcher ==
- kEnableCORSHandlingByResourceFetcher;
+ kEnableCorsHandlingByResourceFetcher;
}
} // namespace blink
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
index 308456b..d509ab9 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
@@ -178,13 +178,13 @@
void OnProgress(uint64_t delta) override;
void FinishedCreatingBlob(const scoped_refptr<BlobDataHandle>&);
- bool GetCORSFlag() const { return resource_->Options().cors_flag; }
+ bool GetCorsFlag() const { return resource_->Options().cors_flag; }
base::Optional<ResourceRequestBlockedReason> CheckResponseNosniff(
mojom::RequestContextType,
const ResourceResponse&) const;
- bool ShouldCheckCORSInResourceLoader() const;
+ bool ShouldCheckCorsInResourceLoader() const;
std::unique_ptr<WebURLLoader> loader_;
ResourceLoadScheduler::ClientId scheduler_client_id_;
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h b/third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h
index df851a8c..07983d1 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h
@@ -59,9 +59,9 @@
// Used by the ThreadableLoader to turn off part of the CORS handling
// logic in the ResourceFetcher to use its own CORS handling logic.
-enum CORSHandlingByResourceFetcher {
- kDisableCORSHandlingByResourceFetcher,
- kEnableCORSHandlingByResourceFetcher,
+enum CorsHandlingByResourceFetcher {
+ kDisableCorsHandlingByResourceFetcher,
+ kEnableCorsHandlingByResourceFetcher,
};
// Was the request generated from a "parser-inserted" element?
@@ -83,7 +83,7 @@
content_security_policy_option(kCheckContentSecurityPolicy),
request_initiator_context(kDocumentContext),
synchronous_policy(kRequestAsynchronously),
- cors_handling_by_resource_fetcher(kEnableCORSHandlingByResourceFetcher),
+ cors_handling_by_resource_fetcher(kEnableCorsHandlingByResourceFetcher),
cors_flag(false),
parser_disposition(kParserInserted),
cache_aware_loading_enabled(kNotCacheAwareLoadingEnabled) {}
@@ -96,10 +96,10 @@
RequestInitiatorContext request_initiator_context;
SynchronousPolicy synchronous_policy;
- // When set to kDisableCORSHandlingByResourceFetcher, the ResourceFetcher
+ // When set to kDisableCorsHandlingByResourceFetcher, the ResourceFetcher
// suppresses part of its CORS handling logic.
// Used by ThreadableLoader which does CORS handling by itself.
- CORSHandlingByResourceFetcher cors_handling_by_resource_fetcher;
+ CorsHandlingByResourceFetcher cors_handling_by_resource_fetcher;
// Corresponds to the CORS flag in the Fetch spec.
bool cors_flag;
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader_test.cc b/third_party/blink/renderer/platform/loader/fetch/resource_loader_test.cc
index 712f78c7..274bcb8 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_loader_test.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader_test.cc
@@ -106,8 +106,8 @@
}
TEST_F(ResourceLoaderTest, ResponseType) {
- // This test will be trivial if EnableOutOfBlinkCORS is enabled.
- WebRuntimeFeatures::EnableOutOfBlinkCORS(false);
+ // This test will be trivial if EnableOutOfBlinkCors is enabled.
+ WebRuntimeFeatures::EnableOutOfBlinkCors(false);
const scoped_refptr<const SecurityOrigin> origin =
SecurityOrigin::Create(foo_url_);
@@ -117,40 +117,40 @@
TestCase cases[] = {
// Same origin response:
- {same_origin_url, FetchRequestMode::kNoCORS, From::kNetwork, no_origin,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kNetwork, no_origin,
FetchResponseType::kDefault, FetchResponseType::kBasic},
- {same_origin_url, FetchRequestMode::kCORS, From::kNetwork, no_origin,
+ {same_origin_url, FetchRequestMode::kCors, From::kNetwork, no_origin,
FetchResponseType::kDefault, FetchResponseType::kBasic},
// Cross origin, no-cors:
- {cross_origin_url, FetchRequestMode::kNoCORS, From::kNetwork, no_origin,
+ {cross_origin_url, FetchRequestMode::kNoCors, From::kNetwork, no_origin,
FetchResponseType::kDefault, FetchResponseType::kOpaque},
// Cross origin, cors:
- {cross_origin_url, FetchRequestMode::kCORS, From::kNetwork, origin,
- FetchResponseType::kDefault, FetchResponseType::kCORS},
- {cross_origin_url, FetchRequestMode::kCORS, From::kNetwork, no_origin,
+ {cross_origin_url, FetchRequestMode::kCors, From::kNetwork, origin,
+ FetchResponseType::kDefault, FetchResponseType::kCors},
+ {cross_origin_url, FetchRequestMode::kCors, From::kNetwork, no_origin,
FetchResponseType::kDefault, FetchResponseType::kError},
// From service worker, no-cors:
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
no_origin, FetchResponseType::kBasic, FetchResponseType::kBasic},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
- no_origin, FetchResponseType::kCORS, FetchResponseType::kCORS},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
+ no_origin, FetchResponseType::kCors, FetchResponseType::kCors},
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
no_origin, FetchResponseType::kDefault, FetchResponseType::kDefault},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
no_origin, FetchResponseType::kOpaque, FetchResponseType::kOpaque},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
no_origin, FetchResponseType::kOpaqueRedirect,
FetchResponseType::kOpaqueRedirect},
// From service worker, cors:
- {same_origin_url, FetchRequestMode::kCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kCors, From::kServiceWorker,
no_origin, FetchResponseType::kBasic, FetchResponseType::kBasic},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
- no_origin, FetchResponseType::kCORS, FetchResponseType::kCORS},
- {same_origin_url, FetchRequestMode::kNoCORS, From::kServiceWorker,
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
+ no_origin, FetchResponseType::kCors, FetchResponseType::kCors},
+ {same_origin_url, FetchRequestMode::kNoCors, From::kServiceWorker,
no_origin, FetchResponseType::kDefault, FetchResponseType::kDefault},
};
@@ -173,7 +173,7 @@
request.SetRequestContext(mojom::RequestContextType::FETCH);
FetchParameters fetch_parameters(request);
- if (test.request_mode == network::mojom::FetchRequestMode::kCORS) {
+ if (test.request_mode == network::mojom::FetchRequestMode::kCors) {
fetch_parameters.SetCrossOriginAccessControl(
origin.get(), network::mojom::FetchCredentialsMode::kOmit);
}
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
index a07607c07..25acb5f 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
@@ -70,7 +70,7 @@
previews_state_(WebURLRequest::kPreviewsUnspecified),
request_context_(mojom::RequestContextType::UNSPECIFIED),
frame_type_(network::mojom::RequestContextFrameType::kNone),
- fetch_request_mode_(network::mojom::FetchRequestMode::kNoCORS),
+ fetch_request_mode_(network::mojom::FetchRequestMode::kNoCors),
fetch_importance_mode_(mojom::FetchImportanceMode::kImportanceAuto),
fetch_credentials_mode_(network::mojom::FetchCredentialsMode::kInclude),
fetch_redirect_mode_(network::mojom::FetchRedirectMode::kFollow),
@@ -80,7 +80,7 @@
was_discarded_(false),
is_external_request_(false),
cors_preflight_policy_(
- network::mojom::CORSPreflightPolicy::kConsiderPreflight),
+ network::mojom::CorsPreflightPolicy::kConsiderPreflight),
redirect_status_(RedirectStatus::kNoRedirect) {}
ResourceRequest::ResourceRequest(const ResourceRequest&) = default;
@@ -124,7 +124,7 @@
if (request->HttpMethod() == HttpMethod())
request->SetHTTPBody(HttpBody());
request->SetWasDiscarded(WasDiscarded());
- request->SetCORSPreflightPolicy(CORSPreflightPolicy());
+ request->SetCorsPreflightPolicy(CorsPreflightPolicy());
if (IsAdResource())
request->SetIsAdResource();
request->SetInitiatorCSP(GetInitiatorCSP());
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
index 4dc1e656..0614567b 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
@@ -339,10 +339,10 @@
bool IsExternalRequest() const { return is_external_request_; }
void SetExternalRequestStateFromRequestorAddressSpace(mojom::IPAddressSpace);
- network::mojom::CORSPreflightPolicy CORSPreflightPolicy() const {
+ network::mojom::CorsPreflightPolicy CorsPreflightPolicy() const {
return cors_preflight_policy_;
}
- void SetCORSPreflightPolicy(network::mojom::CORSPreflightPolicy policy) {
+ void SetCorsPreflightPolicy(network::mojom::CorsPreflightPolicy policy) {
cors_preflight_policy_ = policy;
}
@@ -461,7 +461,7 @@
bool did_set_http_referrer_;
bool was_discarded_;
bool is_external_request_;
- network::mojom::CORSPreflightPolicy cors_preflight_policy_;
+ network::mojom::CorsPreflightPolicy cors_preflight_policy_;
RedirectStatus redirect_status_;
base::Optional<String> suggested_filename_;
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_response.cc b/third_party/blink/renderer/platform/loader/fetch/resource_response.cc
index ae7b255..efc1e816 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_response.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_response.cc
@@ -402,7 +402,7 @@
}
bool ResourceResponse::IsOpaqueResponseFromServiceWorker() const {
- return IsCORSCrossOrigin() && WasFetchedViaServiceWorker();
+ return IsCorsCrossOrigin() && WasFetchedViaServiceWorker();
}
KURL ResourceResponse::OriginalURLViaServiceWorker() const {
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_response.h b/third_party/blink/renderer/platform/loader/fetch/resource_response.h
index 5447f4e5..b1fe3f58 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_response.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_response.h
@@ -302,12 +302,12 @@
}
bool IsOpaqueResponseFromServiceWorker() const;
// https://html.spec.whatwg.org/#cors-same-origin
- bool IsCORSSameOrigin() const {
- return network::cors::IsCORSSameOriginResponseType(response_type_);
+ bool IsCorsSameOrigin() const {
+ return network::cors::IsCorsSameOriginResponseType(response_type_);
}
// https://html.spec.whatwg.org/#cors-cross-origin
- bool IsCORSCrossOrigin() const {
- return network::cors::IsCORSCrossOriginResponseType(response_type_);
+ bool IsCorsCrossOrigin() const {
+ return network::cors::IsCorsCrossOriginResponseType(response_type_);
}
// See ServiceWorkerResponseInfo::url_list_via_service_worker.
diff --git a/third_party/blink/renderer/platform/loader/subresource_integrity.cc b/third_party/blink/renderer/platform/loader/subresource_integrity.cc
index dbaaeb5..fa1a4fb 100644
--- a/third_party/blink/renderer/platform/loader/subresource_integrity.cc
+++ b/third_party/blink/renderer/platform/loader/subresource_integrity.cc
@@ -80,7 +80,7 @@
// FetchResponseType::kError never arrives because it is a loading error.
DCHECK_NE(resource.GetResponse().GetType(),
network::mojom::FetchResponseType::kError);
- if (!resource.GetResponse().IsCORSSameOrigin()) {
+ if (!resource.GetResponse().IsCorsSameOrigin()) {
report_info.AddConsoleErrorMessage(
"Subresource Integrity: The resource '" + resource_url.ElidedString() +
"' has an integrity attribute, but the resource "
diff --git a/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc b/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc
index 5ef60f6..ec90823 100644
--- a/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc
+++ b/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc
@@ -538,20 +538,20 @@
const TestCase cases[] = {
// FetchResponseType::kError never arrives because it is a loading error.
- {url, FetchRequestMode::kNoCORS, FetchResponseType::kBasic, kOk},
- {url, FetchRequestMode::kNoCORS, FetchResponseType::kCORS, kOk},
- {url, FetchRequestMode::kNoCORS, FetchResponseType::kDefault, kOk},
- {url, FetchRequestMode::kNoCORS, FetchResponseType::kOpaque, kFail},
- {url, FetchRequestMode::kNoCORS, FetchResponseType::kOpaqueRedirect,
+ {url, FetchRequestMode::kNoCors, FetchResponseType::kBasic, kOk},
+ {url, FetchRequestMode::kNoCors, FetchResponseType::kCors, kOk},
+ {url, FetchRequestMode::kNoCors, FetchResponseType::kDefault, kOk},
+ {url, FetchRequestMode::kNoCors, FetchResponseType::kOpaque, kFail},
+ {url, FetchRequestMode::kNoCors, FetchResponseType::kOpaqueRedirect,
kFail},
// FetchResponseType::kError never arrives because it is a loading error.
// FetchResponseType::kOpaque and FetchResponseType::kOpaqueResponse
// never arrives: even when service worker is involved, it's handled as
// an error.
- {url, FetchRequestMode::kCORS, FetchResponseType::kBasic, kOk},
- {url, FetchRequestMode::kCORS, FetchResponseType::kCORS, kOk},
- {url, FetchRequestMode::kCORS, FetchResponseType::kDefault, kOk},
+ {url, FetchRequestMode::kCors, FetchResponseType::kBasic, kOk},
+ {url, FetchRequestMode::kCors, FetchResponseType::kCors, kOk},
+ {url, FetchRequestMode::kCors, FetchResponseType::kDefault, kOk},
};
MockWebCryptoDigestorFactory factory_sha256(
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 10e6efb..858ee55 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -890,7 +890,7 @@
implied_by: ["OriginTrialsSampleAPI"],
},
{
- name: "OutOfBlinkCORS",
+ name: "OutOfBlinkCors",
},
{
name: "OverflowIconsForMediaControls",
diff --git a/third_party/blink/renderer/platform/testing/empty_web_media_player.cc b/third_party/blink/renderer/platform/testing/empty_web_media_player.cc
index 10ed823d..76f39b5 100644
--- a/third_party/blink/renderer/platform/testing/empty_web_media_player.cc
+++ b/third_party/blink/renderer/platform/testing/empty_web_media_player.cc
@@ -10,7 +10,7 @@
namespace blink {
WebMediaPlayer::LoadTiming
-EmptyWebMediaPlayer::Load(LoadType, const WebMediaPlayerSource&, CORSMode) {
+EmptyWebMediaPlayer::Load(LoadType, const WebMediaPlayerSource&, CorsMode) {
return LoadTiming::kImmediate;
}
diff --git a/third_party/blink/renderer/platform/testing/empty_web_media_player.h b/third_party/blink/renderer/platform/testing/empty_web_media_player.h
index 86bef319..205fde9 100644
--- a/third_party/blink/renderer/platform/testing/empty_web_media_player.h
+++ b/third_party/blink/renderer/platform/testing/empty_web_media_player.h
@@ -22,7 +22,7 @@
public:
~EmptyWebMediaPlayer() override = default;
- LoadTiming Load(LoadType, const WebMediaPlayerSource&, CORSMode) override;
+ LoadTiming Load(LoadType, const WebMediaPlayerSource&, CorsMode) override;
void Play() override {}
void Pause() override {}
void Seek(double seconds) override {}
diff --git a/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc b/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
index bba1484e..79e558fd 100644
--- a/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
+++ b/third_party/blink/renderer/platform/weborigin/origin_access_entry.cc
@@ -39,7 +39,7 @@
const String& protocol,
const String& host,
network::cors::OriginAccessEntry::MatchMode match_mode,
- network::mojom::CORSOriginAccessMatchPriority priority)
+ network::mojom::CorsOriginAccessMatchPriority priority)
: private_(std::string(protocol.Utf8().data()),
std::string(host.Utf8().data()),
match_mode,
diff --git a/third_party/blink/renderer/platform/weborigin/origin_access_entry.h b/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
index 7b7ae44..e876f883 100644
--- a/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
+++ b/third_party/blink/renderer/platform/weborigin/origin_access_entry.h
@@ -55,8 +55,8 @@
const String& protocol,
const String& host,
network::cors::OriginAccessEntry::MatchMode,
- network::mojom::CORSOriginAccessMatchPriority priority =
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority priority =
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
OriginAccessEntry(OriginAccessEntry&& from);
// 'matchesOrigin' requires a protocol match (e.g. 'http' != 'https').
diff --git a/third_party/blink/renderer/platform/weborigin/scheme_registry.cc b/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
index a86de19..65a0b90 100644
--- a/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
+++ b/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
@@ -58,7 +58,7 @@
secure_schemes.insert(scheme.c_str());
for (auto& scheme : url::GetNoAccessSchemes())
schemes_with_unique_origins.insert(scheme.c_str());
- for (auto& scheme : url::GetCORSEnabledSchemes())
+ for (auto& scheme : url::GetCorsEnabledSchemes())
cors_enabled_schemes.insert(scheme.c_str());
for (auto& scheme : url::GetCSPBypassingSchemes()) {
content_security_policy_bypassing_schemes.insert(
@@ -224,14 +224,14 @@
scheme);
}
-bool SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(const String& scheme) {
+bool SchemeRegistry::ShouldTreatURLSchemeAsCorsEnabled(const String& scheme) {
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().cors_enabled_schemes.Contains(scheme);
}
-String SchemeRegistry::ListOfCORSEnabledURLSchemes() {
+String SchemeRegistry::ListOfCorsEnabledURLSchemes() {
StringBuilder builder;
bool add_separator = false;
for (const auto& scheme : GetURLSchemesRegistry().cors_enabled_schemes) {
diff --git a/third_party/blink/renderer/platform/weborigin/scheme_registry.h b/third_party/blink/renderer/platform/weborigin/scheme_registry.h
index 4676a712..79b4b53 100644
--- a/third_party/blink/renderer/platform/weborigin/scheme_registry.h
+++ b/third_party/blink/renderer/platform/weborigin/scheme_registry.h
@@ -87,10 +87,10 @@
static bool ShouldTreatURLSchemeAsNotAllowingJavascriptURLs(
const String& scheme);
- static bool ShouldTreatURLSchemeAsCORSEnabled(const String& scheme);
+ static bool ShouldTreatURLSchemeAsCorsEnabled(const String& scheme);
// Serialize the registered schemes in a comma-separated list.
- static String ListOfCORSEnabledURLSchemes();
+ static String ListOfCorsEnabledURLSchemes();
// "Legacy" schemes (e.g. 'ftp:', 'gopher:') which we might want to treat
// differently from "webby" schemes.
diff --git a/third_party/blink/renderer/platform/weborigin/security_origin_test.cc b/third_party/blink/renderer/platform/weborigin/security_origin_test.cc
index 4b45eca..846c928c 100644
--- a/third_party/blink/renderer/platform/weborigin/security_origin_test.cc
+++ b/third_party/blink/renderer/platform/weborigin/security_origin_test.cc
@@ -361,7 +361,7 @@
// Adding the url to the access allowlist should allow the request.
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_TRUE(origin->CanRequest(url));
}
@@ -374,10 +374,10 @@
// BlockList that is more or same specificity wins.
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::AddOriginAccessBlockListEntry(
*origin, "https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
// Block since example.com is on the allowlist & blocklist.
EXPECT_FALSE(origin->CanRequest(blocked_url));
// Allow since *.example.com is on the allowlist but not the blocklist.
@@ -392,10 +392,10 @@
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "test.example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
SecurityPolicy::AddOriginAccessBlockListEntry(
*origin, "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
// Allow since test.example.com (allowlist) has a higher priority than
// *.example.com (blocklist).
EXPECT_TRUE(origin->CanRequest(allowed_url));
@@ -416,14 +416,14 @@
// Verify unicode origin can not be allowlisted.
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "☃.net", true,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_FALSE(origin->CanRequest(punycode_url));
EXPECT_FALSE(origin->CanRequest(unicode_url));
// Verify punycode allowlist only affects punycode URLs.
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "xn--n3h.net", true,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_TRUE(origin->CanRequest(punycode_url));
EXPECT_FALSE(origin->CanRequest(unicode_url));
@@ -436,7 +436,7 @@
// Simulate <all_urls> being in the extension permissions.
SecurityPolicy::AddOriginAccessAllowListEntry(
*origin, "https", "", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(origin->CanRequest(punycode_url));
EXPECT_FALSE(origin->CanRequest(unicode_url));
@@ -444,14 +444,14 @@
// Verify unicode origin can not be blocklisted.
SecurityPolicy::AddOriginAccessBlockListEntry(
*origin, "https", "☃.net", true,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
EXPECT_TRUE(origin->CanRequest(punycode_url));
EXPECT_FALSE(origin->CanRequest(unicode_url));
// Verify punycode blocklist only affects punycode URLs.
SecurityPolicy::AddOriginAccessBlockListEntry(
*origin, "https", "xn--n3h.net", true,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
EXPECT_FALSE(origin->CanRequest(punycode_url));
EXPECT_FALSE(origin->CanRequest(unicode_url));
}
diff --git a/third_party/blink/renderer/platform/weborigin/security_policy.cc b/third_party/blink/renderer/platform/weborigin/security_policy.cc
index e142e07..9ef5ab6e 100644
--- a/third_party/blink/renderer/platform/weborigin/security_policy.cc
+++ b/third_party/blink/renderer/platform/weborigin/security_policy.cc
@@ -240,7 +240,7 @@
const String& destination_protocol,
const String& destination_domain,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
MutexLocker lock(GetMutex());
GetOriginAccessList().AddAllowListEntryForOrigin(
source_origin.ToUrlOrigin(), network::mojom::CorsOriginPattern::New(
@@ -254,7 +254,7 @@
const String& destination_protocol,
const String& destination_domain,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority) {
+ const network::mojom::CorsOriginAccessMatchPriority priority) {
MutexLocker lock(GetMutex());
GetOriginAccessList().AddBlockListEntryForOrigin(
source_origin.ToUrlOrigin(), network::mojom::CorsOriginPattern::New(
diff --git a/third_party/blink/renderer/platform/weborigin/security_policy.h b/third_party/blink/renderer/platform/weborigin/security_policy.h
index e58569b6..8d32d07d 100644
--- a/third_party/blink/renderer/platform/weborigin/security_policy.h
+++ b/third_party/blink/renderer/platform/weborigin/security_policy.h
@@ -71,13 +71,13 @@
const String& destination_protocol,
const String& destination_domain,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority);
+ const network::mojom::CorsOriginAccessMatchPriority priority);
static void AddOriginAccessBlockListEntry(
const SecurityOrigin& source_origin,
const String& destination_protocol,
const String& destination_domain,
bool allow_destination_subdomains,
- const network::mojom::CORSOriginAccessMatchPriority priority);
+ const network::mojom::CorsOriginAccessMatchPriority priority);
static void ClearOriginAccessListForOrigin(
const SecurityOrigin& source_origin);
static void ClearOriginAccessList();
diff --git a/third_party/blink/renderer/platform/weborigin/security_policy_test.cc b/third_party/blink/renderer/platform/weborigin/security_policy_test.cc
index 8ed5007a..a8bd312 100644
--- a/third_party/blink/renderer/platform/weborigin/security_policy_test.cc
+++ b/third_party/blink/renderer/platform/weborigin/security_policy_test.cc
@@ -349,7 +349,7 @@
// access to subdomains or other schemes.
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
https_example_origin()));
EXPECT_FALSE(SecurityPolicy::IsOriginAccessAllowed(
@@ -370,7 +370,7 @@
// subdomains.
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
https_example_origin()));
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(
@@ -383,7 +383,7 @@
// An empty domain that matches subdomains results in matching every domain.
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
https_example_origin()));
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
@@ -396,10 +396,10 @@
// The block list takes priority over the allow list.
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::AddOriginAccessBlockListEntry(
*https_chromium_origin(), "https", "example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_FALSE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
https_example_origin()));
@@ -411,10 +411,10 @@
IsOriginAccessAllowedWildcardWithBlockListEntry) {
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::AddOriginAccessBlockListEntry(
*https_chromium_origin(), "https", "google.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(https_chromium_origin(),
https_example_origin()));
@@ -425,13 +425,13 @@
TEST_F(SecurityPolicyAccessTest, ClearOriginAccessListForOrigin) {
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "google.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_example_origin(), "https", "google.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
SecurityPolicy::ClearOriginAccessListForOrigin(*https_chromium_origin());
@@ -448,17 +448,17 @@
https_chromium_origin(), https_sub_example_origin()));
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "sub.example.com", false,
- network::mojom::CORSOriginAccessMatchPriority::kLowPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kLowPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(
https_chromium_origin(), https_sub_example_origin()));
SecurityPolicy::AddOriginAccessBlockListEntry(
*https_chromium_origin(), "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kMediumPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kMediumPriority);
EXPECT_FALSE(SecurityPolicy::IsOriginAccessAllowed(
https_chromium_origin(), https_sub_example_origin()));
SecurityPolicy::AddOriginAccessAllowListEntry(
*https_chromium_origin(), "https", "example.com", true,
- network::mojom::CORSOriginAccessMatchPriority::kHighPriority);
+ network::mojom::CorsOriginAccessMatchPriority::kHighPriority);
EXPECT_TRUE(SecurityPolicy::IsOriginAccessAllowed(
https_chromium_origin(), https_sub_example_origin()));
diff --git a/url/url_util.cc b/url/url_util.cc
index 4bede9d..a515231 100644
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -9,6 +9,7 @@
#include "base/debug/leak_annotations.h"
#include "base/logging.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "url/url_canon_internal.h"
#include "url/url_constants.h"
@@ -65,10 +66,8 @@
kDataScheme,
};
-const char* kCORSEnabledSchemes[] = {
- kHttpsScheme,
- kHttpScheme,
- kDataScheme,
+const char* kCorsEnabledSchemes[] = {
+ kHttpsScheme, kHttpScheme, kDataScheme,
};
const char* kWebStorageSchemes[] = {
@@ -512,20 +511,20 @@
if (initialized)
return;
InitSchemesWithType(&standard_schemes, kStandardURLSchemes,
- arraysize(kStandardURLSchemes));
+ base::size(kStandardURLSchemes));
InitSchemesWithType(&referrer_schemes, kReferrerURLSchemes,
- arraysize(kReferrerURLSchemes));
- InitSchemes(&secure_schemes, kSecureSchemes, arraysize(kSecureSchemes));
- InitSchemes(&local_schemes, kLocalSchemes, arraysize(kLocalSchemes));
+ base::size(kReferrerURLSchemes));
+ InitSchemes(&secure_schemes, kSecureSchemes, base::size(kSecureSchemes));
+ InitSchemes(&local_schemes, kLocalSchemes, base::size(kLocalSchemes));
InitSchemes(&no_access_schemes, kNoAccessSchemes,
- arraysize(kNoAccessSchemes));
- InitSchemes(&cors_enabled_schemes, kCORSEnabledSchemes,
- arraysize(kCORSEnabledSchemes));
+ base::size(kNoAccessSchemes));
+ InitSchemes(&cors_enabled_schemes, kCorsEnabledSchemes,
+ base::size(kCorsEnabledSchemes));
InitSchemes(&web_storage_schemes, kWebStorageSchemes,
- arraysize(kWebStorageSchemes));
+ base::size(kWebStorageSchemes));
InitSchemes(&csp_bypassing_schemes, nullptr, 0);
InitSchemes(&empty_document_schemes, kEmptyDocumentSchemes,
- arraysize(kEmptyDocumentSchemes));
+ base::size(kEmptyDocumentSchemes));
initialized = true;
}
@@ -591,12 +590,12 @@
return *no_access_schemes;
}
-void AddCORSEnabledScheme(const char* new_scheme) {
+void AddCorsEnabledScheme(const char* new_scheme) {
Initialize();
DoAddScheme(new_scheme, cors_enabled_schemes);
}
-const std::vector<std::string>& GetCORSEnabledSchemes() {
+const std::vector<std::string>& GetCorsEnabledSchemes() {
Initialize();
return *cors_enabled_schemes;
}
diff --git a/url/url_util.h b/url/url_util.h
index 32e7f0d..d4b0d773 100644
--- a/url/url_util.h
+++ b/url/url_util.h
@@ -80,8 +80,8 @@
// Adds an application-defined scheme to the list of schemes that can be sent
// CORS requests.
-URL_EXPORT void AddCORSEnabledScheme(const char* new_scheme);
-URL_EXPORT const std::vector<std::string>& GetCORSEnabledSchemes();
+URL_EXPORT void AddCorsEnabledScheme(const char* new_scheme);
+URL_EXPORT const std::vector<std::string>& GetCorsEnabledSchemes();
// Adds an application-defined scheme to the list of web schemes that can be
// used by web to store data (e.g. cookies, local storage, ...). This is
