bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chrome: Fix ResourceRequestHandlerTest failures (see issue #2969)

This commit is contained in:
Marshall Greenblatt 2021-05-28 20:17:47 -04:00
parent e411b513be
commit f3ddec372f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/ceftests/resource_request_handler_unittest.cc
View File

@ -1567,20 +1567,27 @@ class SubresourceResponseTest : public RoutingTestHandler {
EXPECT_IO_THREAD(); EXPECT_IO_THREAD();
EXPECT_EQ(browser_id_, browser->GetIdentifier()); EXPECT_EQ(browser_id_, browser->GetIdentifier());
if (IsMainURL(request->GetURL())) { const std::string& url = request->GetURL();
if (IgnoreURL(url))
return nullptr;
const bool is_main_url = IsMainURL(url);
const bool is_sub_url = IsSubURL(url);
if (is_main_url) {
EXPECT_TRUE(frame->IsMain()); EXPECT_TRUE(frame->IsMain());
} else if (IsSubURL(request->GetURL())) { } else if (is_sub_url) {
EXPECT_FALSE(frame->IsMain()); EXPECT_FALSE(frame->IsMain());
EXPECT_TRUE(subframe_); EXPECT_TRUE(subframe_);
} }
if (IsMainURL(request->GetURL()) || IsSubURL(request->GetURL())) { if (is_main_url || is_sub_url) {
// Track the frame ID that we'll expect for resource callbacks. // Track the frame ID that we'll expect for resource callbacks.
// Do this here instead of OnBeforeBrowse because OnBeforeBrowse may // Do this here instead of OnBeforeBrowse because OnBeforeBrowse may
// return -4 (kInvalidFrameId) for the initial navigation. // return -4 (kInvalidFrameId) for the initial navigation.
if (frame_id_ == 0) { if (frame_id_ == 0) {
if (subframe_) { if (subframe_) {
if (IsSubURL(request->GetURL())) if (is_sub_url)
frame_id_ = frame->GetIdentifier(); frame_id_ = frame->GetIdentifier();
} else { } else {
frame_id_ = frame->GetIdentifier(); frame_id_ = frame->GetIdentifier();
@ -1626,10 +1633,14 @@ class SubresourceResponseTest : public RoutingTestHandler {
EXPECT_IO_THREAD(); EXPECT_IO_THREAD();
EXPECT_EQ(browser_id_, browser->GetIdentifier()); EXPECT_EQ(browser_id_, browser->GetIdentifier());
if (IsMainURL(request->GetURL())) { const std::string& url = request->GetURL();
if (IgnoreURL(url))
return nullptr;
if (IsMainURL(url)) {
EXPECT_TRUE(frame->IsMain()); EXPECT_TRUE(frame->IsMain());
return nullptr; return nullptr;
} else if (IsSubURL(request->GetURL())) { } else if (IsSubURL(url)) {
EXPECT_FALSE(frame->IsMain()); EXPECT_FALSE(frame->IsMain());
EXPECT_TRUE(subframe_); EXPECT_TRUE(subframe_);
return nullptr; return nullptr;