summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 15:05:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:33:47 +0000
commite684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch)
treed55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc
parent2b94bfe47ccb6c08047959d1c26e392919550e86 (diff)
downloadqtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc b/chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc
index dfe65ba5f09..22f4dfe135d 100644
--- a/chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc
+++ b/chromium/third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc
@@ -116,8 +116,9 @@ class WebFrameSerializerSanitizationTest : public testing::Test {
KURL parsed_url(url);
String file_path("frameserialization/" + file_name);
RegisterMockedFileURLLoad(parsed_url, file_path, mime_type);
- FrameTestHelpers::LoadFrame(MainFrameImpl(), url.Utf8().data());
- MainFrameImpl()->GetFrame()->View()->UpdateAllLifecyclePhases();
+ frame_test_helpers::LoadFrame(MainFrameImpl(), url.Utf8().data());
+ MainFrameImpl()->GetFrame()->View()->UpdateAllLifecyclePhases(
+ DocumentLifecycle::LifecycleUpdateReason::kTest);
}
String GenerateMHTML(const bool only_body_parts) {
@@ -171,7 +172,8 @@ class WebFrameSerializerSanitizationTest : public testing::Test {
shadow_root->SetDelegatesFocus(delegates_focus);
shadow_root->SetInnerHTMLFromString(String::FromUTF8(shadow_content),
ASSERT_NO_EXCEPTION);
- scope.GetDocument().View()->UpdateAllLifecyclePhases();
+ scope.GetDocument().View()->UpdateAllLifecyclePhases(
+ DocumentLifecycle::LifecycleUpdateReason::kTest);
return shadow_root;
}
@@ -182,7 +184,7 @@ class WebFrameSerializerSanitizationTest : public testing::Test {
void RegisterMockedFileURLLoad(const KURL& url,
const String& file_path,
const String& mime_type = "image/png") {
- URLTestHelpers::RegisterMockedURLLoad(
+ url_test_helpers::RegisterMockedURLLoad(
url, test::CoreTestDataPath(file_path.Utf8().data()), mime_type);
}
@@ -193,7 +195,7 @@ class WebFrameSerializerSanitizationTest : public testing::Test {
HistogramTester histogram_tester_;
private:
- FrameTestHelpers::WebViewHelper helper_;
+ frame_test_helpers::WebViewHelper helper_;
SimpleMHTMLPartsGenerationDelegate mhtml_delegate_;
};