Commit 2e53b48b authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Commit Bot

Prerender: Move tests for prerender from core/exported/ to core/loader/

This CL moves the tests for prerender from core/exported/ to
core/loader/ to support core/exported/ deprecation. See the following
doc for details of the deprecation:
https://docs.google.com/document/d/1lzGeXN4nwnANdFSpVxmJ1TUgb3QBPFCjVxLsFVBlKdE/edit?usp=sharing

This CL also renames prerendering_test.cc to prerender_test.cc, and
PrerenderingTest to PrerenderTest for consistency with other prerender
components.

Bug: n/a
Change-Id: Ia1af6176b3cb2e01e5fa9f7f514801f1c352a10d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409431
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807398}
parent 9f8955ff
...@@ -1083,7 +1083,6 @@ source_set("unit_tests") { ...@@ -1083,7 +1083,6 @@ source_set("unit_tests") {
"execution_context/agent_metrics_collector_test.cc", "execution_context/agent_metrics_collector_test.cc",
"execution_context/execution_context_lifecycle_state_observer_test.cc", "execution_context/execution_context_lifecycle_state_observer_test.cc",
"exported/local_frame_client_impl_test.cc", "exported/local_frame_client_impl_test.cc",
"exported/prerendering_test.cc",
"exported/web_document_subresource_filter_test.cc", "exported/web_document_subresource_filter_test.cc",
"exported/web_document_test.cc", "exported/web_document_test.cc",
"exported/web_drag_data_test.cc", "exported/web_drag_data_test.cc",
...@@ -1286,6 +1285,7 @@ source_set("unit_tests") { ...@@ -1286,6 +1285,7 @@ source_set("unit_tests") {
"loader/modulescript/module_tree_linker_test.cc", "loader/modulescript/module_tree_linker_test.cc",
"loader/navigation_policy_test.cc", "loader/navigation_policy_test.cc",
"loader/ping_loader_test.cc", "loader/ping_loader_test.cc",
"loader/prerender_test.cc",
"loader/previews_resource_loading_hints_test.cc", "loader/previews_resource_loading_hints_test.cc",
"loader/programmatic_scroll_test.cc", "loader/programmatic_scroll_test.cc",
"loader/progress_tracker_test.cc", "loader/progress_tracker_test.cc",
......
...@@ -159,9 +159,9 @@ class MockPrerenderProcessor : public mojom::blink::PrerenderProcessor { ...@@ -159,9 +159,9 @@ class MockPrerenderProcessor : public mojom::blink::PrerenderProcessor {
size_t add_count_ = 0; size_t add_count_ = 0;
}; };
class PrerenderingTest : public testing::Test { class PrerenderTest : public testing::Test {
public: public:
~PrerenderingTest() override { ~PrerenderTest() override {
if (web_view_helper_.GetWebView()) if (web_view_helper_.GetWebView())
UnregisterMockPrerenderProcessor(); UnregisterMockPrerenderProcessor();
url_test_helpers::UnregisterAllURLsAndClearMemoryCache(); url_test_helpers::UnregisterAllURLsAndClearMemoryCache();
...@@ -254,7 +254,7 @@ class PrerenderingTest : public testing::Test { ...@@ -254,7 +254,7 @@ class PrerenderingTest : public testing::Test {
} // namespace } // namespace
TEST_F(PrerenderingTest, SinglePrerender) { TEST_F(PrerenderTest, SinglePrerender) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -284,7 +284,7 @@ TEST_F(PrerenderingTest, SinglePrerender) { ...@@ -284,7 +284,7 @@ TEST_F(PrerenderingTest, SinglePrerender) {
EXPECT_EQ("webkitprerenderstop", ConsoleAt(3)); EXPECT_EQ("webkitprerenderstop", ConsoleAt(3));
} }
TEST_F(PrerenderingTest, CancelPrerender) { TEST_F(PrerenderTest, CancelPrerender) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -302,7 +302,7 @@ TEST_F(PrerenderingTest, CancelPrerender) { ...@@ -302,7 +302,7 @@ TEST_F(PrerenderingTest, CancelPrerender) {
EXPECT_EQ(0u, prerender->AbandonCount()); EXPECT_EQ(0u, prerender->AbandonCount());
} }
TEST_F(PrerenderingTest, AbandonPrerender) { TEST_F(PrerenderTest, AbandonPrerender) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -328,7 +328,7 @@ TEST_F(PrerenderingTest, AbandonPrerender) { ...@@ -328,7 +328,7 @@ TEST_F(PrerenderingTest, AbandonPrerender) {
EXPECT_EQ(0u, prerender->AbandonCount()); EXPECT_EQ(0u, prerender->AbandonCount());
} }
TEST_F(PrerenderingTest, TwoPrerenders) { TEST_F(PrerenderTest, TwoPrerenders) {
Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
std::unique_ptr<MockPrerender> first_prerender = std::unique_ptr<MockPrerender> first_prerender =
...@@ -356,7 +356,7 @@ TEST_F(PrerenderingTest, TwoPrerenders) { ...@@ -356,7 +356,7 @@ TEST_F(PrerenderingTest, TwoPrerenders) {
EXPECT_EQ("second_webkitprerenderstart", ConsoleAt(1)); EXPECT_EQ("second_webkitprerenderstart", ConsoleAt(1));
} }
TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating) { TEST_F(PrerenderTest, TwoPrerendersRemovingFirstThenNavigating) {
Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
std::unique_ptr<MockPrerender> first_prerender = std::unique_ptr<MockPrerender> first_prerender =
...@@ -387,7 +387,7 @@ TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating) { ...@@ -387,7 +387,7 @@ TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating) {
EXPECT_EQ(0u, second_prerender->AbandonCount()); EXPECT_EQ(0u, second_prerender->AbandonCount());
} }
TEST_F(PrerenderingTest, TwoPrerendersAddingThird) { TEST_F(PrerenderTest, TwoPrerendersAddingThird) {
Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); Initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
std::unique_ptr<MockPrerender> first_prerender = std::unique_ptr<MockPrerender> first_prerender =
...@@ -415,7 +415,7 @@ TEST_F(PrerenderingTest, TwoPrerendersAddingThird) { ...@@ -415,7 +415,7 @@ TEST_F(PrerenderingTest, TwoPrerendersAddingThird) {
EXPECT_EQ(0u, third_prerender->AbandonCount()); EXPECT_EQ(0u, third_prerender->AbandonCount());
} }
TEST_F(PrerenderingTest, ShortLivedClient) { TEST_F(PrerenderTest, ShortLivedClient) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -433,7 +433,7 @@ TEST_F(PrerenderingTest, ShortLivedClient) { ...@@ -433,7 +433,7 @@ TEST_F(PrerenderingTest, ShortLivedClient) {
prerender->NotifyDidStartPrerender(); prerender->NotifyDidStartPrerender();
} }
TEST_F(PrerenderingTest, FastRemoveElement) { TEST_F(PrerenderTest, FastRemoveElement) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -454,7 +454,7 @@ TEST_F(PrerenderingTest, FastRemoveElement) { ...@@ -454,7 +454,7 @@ TEST_F(PrerenderingTest, FastRemoveElement) {
EXPECT_EQ(0u, ConsoleLength()); EXPECT_EQ(0u, ConsoleLength());
} }
TEST_F(PrerenderingTest, MutateTarget) { TEST_F(PrerenderTest, MutateTarget) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
...@@ -481,7 +481,7 @@ TEST_F(PrerenderingTest, MutateTarget) { ...@@ -481,7 +481,7 @@ TEST_F(PrerenderingTest, MutateTarget) {
EXPECT_EQ(0u, mutated_prerender->AbandonCount()); EXPECT_EQ(0u, mutated_prerender->AbandonCount());
} }
TEST_F(PrerenderingTest, MutateRel) { TEST_F(PrerenderTest, MutateRel) {
Initialize("http://www.foo.com/", "prerender/single_prerender.html"); Initialize("http://www.foo.com/", "prerender/single_prerender.html");
std::unique_ptr<MockPrerender> prerender = std::unique_ptr<MockPrerender> prerender =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment