Introduce [Web]LoaderFreezeMode
Define WebLoaderFreezeMode and replace WebURLLoader::DeferType with it,
and define LoaderFreezeMode, a typedef for the enum in blink/renderer.
This is part of the defer/freeze naming cleanup, and
[Web]LoaderFreezeMode and its members are better names than DeferType
and its members.
This is also good for build time because this reduces the include
directives for public/platform/web_url_loader.h.
Bug: 1211696
Change-Id: Ie4272ded8c25b3c59f382c53bb8f7f36fe315bd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2912337
Commit-Queue: Yutaka Hirano <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#885937}
diff --git a/content/renderer/loader/navigation_body_loader_unittest.cc b/content/renderer/loader/navigation_body_loader_unittest.cc
index 6dd5e80..0916405 100644
--- a/content/renderer/loader/navigation_body_loader_unittest.cc
+++ b/content/renderer/loader/navigation_body_loader_unittest.cc
@@ -116,8 +116,8 @@
}
if (toggle_defers_loading_) {
toggle_defers_loading_ = false;
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kNotDeferred);
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kDeferred);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kNone);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kStrict);
}
if (destroy_loader_) {
destroy_loader_ = false;
@@ -176,8 +176,8 @@
TEST_F(NavigationBodyLoaderTest, SetDefersBeforeStart) {
CreateBodyLoader();
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kDeferred);
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kNotDeferred);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kStrict);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kNone);
// Should not crash.
}
@@ -222,23 +222,22 @@
TEST_F(NavigationBodyLoaderTest, StartDeferred) {
CreateBodyLoader();
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kDeferred);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kStrict);
StartLoading();
Write("hello");
ExpectDataReceived();
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kNotDeferred);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kNone);
Wait();
EXPECT_EQ("hello", TakeDataReceived());
}
TEST_F(NavigationBodyLoaderTest, StartDeferredWithBackForwardCache) {
CreateBodyLoader();
- loader_->SetDefersLoading(
- blink::WebURLLoader::DeferType::kDeferredWithBackForwardCache);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kBufferIncoming);
StartLoading();
Write("hello");
ExpectDataReceived();
- loader_->SetDefersLoading(blink::WebURLLoader::DeferType::kNotDeferred);
+ loader_->SetDefersLoading(blink::WebLoaderFreezeMode::kNone);
Wait();
EXPECT_EQ("hello", TakeDataReceived());
}
