Commit e11f6212 authored by Jose Dapena Paz's avatar Jose Dapena Paz Committed by Commit Bot

GCC: prevent clash of PageScheduler getter with PageScheduler type in...

GCC: prevent clash of PageScheduler getter with PageScheduler type in scheduler affecting features test.

Bug: 819294
Change-Id: I35924bdf9697d2fd4080dd4ff549bcb51d4eef1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310989Reviewed-by: default avatarRoss McIlroy <rmcilroy@chromium.org>
Commit-Queue: José Dapena Paz <jdapena@igalia.com>
Cr-Commit-Position: refs/heads/master@{#790771}
parent 88ae1960
...@@ -20,7 +20,7 @@ namespace blink { ...@@ -20,7 +20,7 @@ namespace blink {
class SchedulingAffectingFeaturesTest : public SimTest { class SchedulingAffectingFeaturesTest : public SimTest {
public: public:
PageScheduler* PageScheduler() { PageScheduler* GetPageScheduler() {
return MainFrameScheduler()->GetPageScheduler(); return MainFrameScheduler()->GetPageScheduler();
} }
...@@ -54,7 +54,7 @@ TEST_F(SchedulingAffectingFeaturesTest, WebSocketStopsThrottling) { ...@@ -54,7 +54,7 @@ TEST_F(SchedulingAffectingFeaturesTest, WebSocketStopsThrottling) {
LoadURL("https://example.com/"); LoadURL("https://example.com/");
EXPECT_FALSE(PageScheduler()->OptedOutFromAggressiveThrottlingForTest()); EXPECT_FALSE(GetPageScheduler()->OptedOutFromAggressiveThrottlingForTest());
EXPECT_THAT(GetNonTrivialMainFrameFeatures(), EXPECT_THAT(GetNonTrivialMainFrameFeatures(),
testing::UnorderedElementsAre()); testing::UnorderedElementsAre());
...@@ -63,14 +63,14 @@ TEST_F(SchedulingAffectingFeaturesTest, WebSocketStopsThrottling) { ...@@ -63,14 +63,14 @@ TEST_F(SchedulingAffectingFeaturesTest, WebSocketStopsThrottling) {
" var socket = new WebSocket(\"ws://www.example.com/websocket\");" " var socket = new WebSocket(\"ws://www.example.com/websocket\");"
"</script>"); "</script>");
EXPECT_TRUE(PageScheduler()->OptedOutFromAggressiveThrottlingForTest()); EXPECT_TRUE(GetPageScheduler()->OptedOutFromAggressiveThrottlingForTest());
EXPECT_THAT( EXPECT_THAT(
GetNonTrivialMainFrameFeatures(), GetNonTrivialMainFrameFeatures(),
testing::UnorderedElementsAre(SchedulingPolicy::Feature::kWebSocket)); testing::UnorderedElementsAre(SchedulingPolicy::Feature::kWebSocket));
MainFrame().ExecuteScript(WebString("socket.close();")); MainFrame().ExecuteScript(WebString("socket.close();"));
EXPECT_FALSE(PageScheduler()->OptedOutFromAggressiveThrottlingForTest()); EXPECT_FALSE(GetPageScheduler()->OptedOutFromAggressiveThrottlingForTest());
EXPECT_THAT(GetNonTrivialMainFrameFeatures(), EXPECT_THAT(GetNonTrivialMainFrameFeatures(),
testing::UnorderedElementsAre()); testing::UnorderedElementsAre());
} }
......
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