Commit 0032d4e5 authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[Cleanup] Use WebContentsConsoleObserver in RFHImpl tests

Update RenderFrameHostImpl browser tests to use
WebContentsConsoleObserver instead of ConsoleObserverDelegate. This
allows us to observe console messages added without overriding the
existing delegate of the WebContents.
Bonus cleanups:
- Avoids the static_cast to WebContentsImpl
- No need for a filter specifying "*"

Bug: 1034150
Change-Id: I24513a79cbcce736cb003cb4fba3c966db9fcd19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1976293Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727272}
parent ea2e8765
...@@ -2662,10 +2662,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest, ...@@ -2662,10 +2662,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
base::test::ScopedFeatureList feature_list; base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(features::kCookieDeprecationMessages); feature_list.InitAndEnableFeature(features::kCookieDeprecationMessages);
WebContentsImpl* web_contents = WebContentsConsoleObserver console_observer(shell()->web_contents());
static_cast<WebContentsImpl*>(shell()->web_contents());
ConsoleObserverDelegate console_observer(web_contents, "*");
web_contents->SetDelegate(&console_observer);
// Test deprecation messages for SameSiteByDefault. // Test deprecation messages for SameSiteByDefault.
// Set a cookie without SameSite on b.com, then access it in a cross-site // Set a cookie without SameSite on b.com, then access it in a cross-site
...@@ -2691,7 +2688,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest, ...@@ -2691,7 +2688,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
// Another copy of the message appears because we have navigated. // Another copy of the message appears because we have navigated.
EXPECT_TRUE(NavigateToURL(shell(), url)); EXPECT_TRUE(NavigateToURL(shell(), url));
EXPECT_EQ(3u, console_observer.messages().size()); EXPECT_EQ(3u, console_observer.messages().size());
EXPECT_EQ(console_observer.messages()[1], console_observer.messages()[2]); EXPECT_EQ(console_observer.messages()[1].message,
console_observer.messages()[2].message);
} }
// Enable SameSiteByDefaultCookies to test deprecation messages for // Enable SameSiteByDefaultCookies to test deprecation messages for
...@@ -2712,10 +2710,7 @@ class RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest ...@@ -2712,10 +2710,7 @@ class RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest
IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest, IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest,
DisplaySameSiteCookieDeprecationMessages) { DisplaySameSiteCookieDeprecationMessages) {
WebContentsImpl* web_contents = WebContentsConsoleObserver console_observer(shell()->web_contents());
static_cast<WebContentsImpl*>(shell()->web_contents());
ConsoleObserverDelegate console_observer(web_contents, "*");
web_contents->SetDelegate(&console_observer);
// Test deprecation messages for SameSiteByDefault. // Test deprecation messages for SameSiteByDefault.
// Set a cookie without SameSite on b.com, then access it in a cross-site // Set a cookie without SameSite on b.com, then access it in a cross-site
...@@ -2755,9 +2750,12 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest, ...@@ -2755,9 +2750,12 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest,
EXPECT_EQ(3u, console_observer.messages().size()); EXPECT_EQ(3u, console_observer.messages().size());
// Check that the messages were all distinct. // Check that the messages were all distinct.
EXPECT_NE(console_observer.messages()[0], console_observer.messages()[1]); EXPECT_NE(console_observer.messages()[0].message,
EXPECT_NE(console_observer.messages()[0], console_observer.messages()[2]); console_observer.messages()[1].message);
EXPECT_NE(console_observer.messages()[1], console_observer.messages()[2]); EXPECT_NE(console_observer.messages()[0].message,
console_observer.messages()[2].message);
EXPECT_NE(console_observer.messages()[1].message,
console_observer.messages()[2].message);
} }
// Test that the SameSite-by-default console warnings are not emitted // Test that the SameSite-by-default console warnings are not emitted
...@@ -2765,10 +2763,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest, ...@@ -2765,10 +2763,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest,
// Regression test for https://crbug.com/1027318. // Regression test for https://crbug.com/1027318.
IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest, IN_PROC_BROWSER_TEST_F(RenderFrameHostImplSameSiteByDefaultCookiesBrowserTest,
NoMessagesIfCookieWouldBeRejectedForOtherReasons) { NoMessagesIfCookieWouldBeRejectedForOtherReasons) {
WebContentsImpl* web_contents = WebContentsConsoleObserver console_observer(shell()->web_contents());
static_cast<WebContentsImpl*>(shell()->web_contents());
ConsoleObserverDelegate console_observer(web_contents, "*");
web_contents->SetDelegate(&console_observer);
GURL url = embedded_test_server()->GetURL( GURL url = embedded_test_server()->GetURL(
"x.com", "/set-cookie?cookiewithpath=1;path=/set-cookie"); "x.com", "/set-cookie?cookiewithpath=1;path=/set-cookie");
......
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