Source/web/tests/ActivityLoggerTest.cpp - Issue 679863002: Revert "Prepare blink to unify definitions of load completion"

Unified Diff: Source/web/tests/ActivityLoggerTest.cpp

Issue 679863002: Revert "Prepare blink to unify definitions of load completion" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/web/tests/ActivityLoggerTest.cpp

diff --git a/Source/web/tests/ActivityLoggerTest.cpp b/Source/web/tests/ActivityLoggerTest.cpp

index a68717655d51f893490218ef82d42168be9b5177..85ced5bd0fb9c04dbca0ab7e15f54c66ec5027a7 100644

--- a/Source/web/tests/ActivityLoggerTest.cpp

+++ b/Source/web/tests/ActivityLoggerTest.cpp

@@ -132,8 +132,7 @@ TEST_F(ActivityLoggerTest, ScriptElement)

"script = document.createElement('script');"

"script.src = 'data:text/javascript;charset=utf-8,';"

"document.body.appendChild(script);"

- "document.write('<body><script src=\\\'data:text/javascript;charset=utf-8,\\\'></script></body>');"

- "document.close();";

+ "document.write('<body><script src=\\\'data:text/javascript;charset=utf-8,\\\'></script></body>');";

const char* expectedActivities =

"blinkAddElement | script | data:text/javascript;charset=utf-8,\n"

"blinkAddElement | script | \n"

@@ -158,8 +157,7 @@ TEST_F(ActivityLoggerTest, IFrameElement)

"iframe = document.createElement('iframe');"

"iframe.src = 'data:text/html;charset=utf-8,';"

"document.body.appendChild(iframe);"

- "document.write('<body><iframe src=\\\'data:text/html;charset=utf-8,\\\'></iframe></body>');"

- "document.close();";

+ "document.write('<body><iframe src=\\\'data:text/html;charset=utf-8,\\\'></iframe></body>');";

const char* expectedActivities =

"blinkAddElement | iframe | data:text/html;charset=utf-8,\n"

"blinkRequestResource | Main resource | data:text/html;charset=utf-8,\n"

@@ -185,8 +183,7 @@ TEST_F(ActivityLoggerTest, AnchorElement)

"a = document.createElement('a');"

"a.href = 'data:text/css;charset=utf-8,';"

"document.body.appendChild(a);"

- "document.write('<body><a href=\\\'data:text/css;charset=utf-8,\\\'></a></body>');"

- "document.close();";

+ "document.write('<body><a href=\\\'data:text/css;charset=utf-8,\\\'></a></body>');";

const char* expectedActivities =

"blinkAddElement | a | data:text/css;charset=utf-8,\n"

"blinkAddElement | a | \n"

@@ -210,8 +207,7 @@ TEST_F(ActivityLoggerTest, LinkElement)

"link.rel = 'stylesheet';"

"link.href = 'data:text/css;charset=utf-8,';"

"document.body.appendChild(link);"

- "document.write('<body><link rel=\\\'stylesheet\\\' href=\\\'data:text/css;charset=utf-8,\\\'></link></body>');"

- "document.close();";

+ "document.write('<body><link rel=\\\'stylesheet\\\' href=\\\'data:text/css;charset=utf-8,\\\'></link></body>');";

const char* expectedActivities =

"blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,\n"

"blinkRequestResource | CSS stylesheet | data:text/css;charset=utf-8,\n"

@@ -238,8 +234,7 @@ TEST_F(ActivityLoggerTest, InputElement)

"input.type = 'submit';"

"input.formAction = 'data:text/html;charset=utf-8,';"

"document.body.appendChild(input);"

- "document.write('<body><input type=\\\'submit\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></input></body>');"

- "document.close();";

+ "document.write('<body><input type=\\\'submit\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></input></body>');";

const char* expectedActivities =

"blinkAddElement | input | submit | data:text/html;charset=utf-8,\n"

"blinkAddElement | input | | \n"

@@ -264,8 +259,7 @@ TEST_F(ActivityLoggerTest, ButtonElement)

"button.formMethod = 'post';"

"button.formAction = 'data:text/html;charset=utf-8,';"

"document.body.appendChild(button);"

- "document.write('<body><button type=\\\'submit\\\' formmethod=\\\'post\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></button></body>');"

- "document.close();";

+ "document.write('<body><button type=\\\'submit\\\' formmethod=\\\'post\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></button></body>');";

const char* expectedActivities =

"blinkAddElement | button | submit | post | data:text/html;charset=utf-8,\n"

"blinkAddElement | button | | | \n"

@@ -289,8 +283,7 @@ TEST_F(ActivityLoggerTest, FormElement)

"form.method = 'post';"

"form.action = 'data:text/html;charset=utf-8,';"

"document.body.appendChild(form);"

- "document.write('<body><form method=\\\'post\\\' action=\\\'data:text/html;charset=utf-8,\\\'></form></body>');"

- "document.close();";

+ "document.write('<body><form method=\\\'post\\\' action=\\\'data:text/html;charset=utf-8,\\\'></form></body>');";

const char* expectedActivities =

"blinkAddElement | form | post | data:text/html;charset=utf-8,\n"

"blinkAddElement | form | | \n"

@@ -506,7 +499,6 @@ TEST_F(ActivityLoggerTest, RequestResource)

"document.write('<img src=\\\'data:text/html;charset=utf-8,B\\\'></img>');"

"document.write('<link rel=\\\'stylesheet\\\' href=\\\'data:text/html;charset=utf-8,C\\\'></link>');"

"document.write('<script src=\\\'data:text/html;charset=utf-8,D\\\'></script>');"

- "document.close();"

"var xhr = new XMLHttpRequest(); xhr.open('GET', 'data:text/html;charset=utf-8,E'); xhr.send();";

const char* expectedActivities =

"blinkAddElement | iframe | data:text/html;charset=utf-8,A\n"

« no previous file with comments | « Source/core/loader/NavigationScheduler.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »