bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] with gcc 7.1

Browse Source
This commit is contained in:
Sergey Linev
2017-08-11 16:56:52 +00:00
committed by Marshall Greenblatt
parent 76eb49196e
commit 5b12134a45
8 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/ceftests/navigation_unittest.cc
View File

@@ -185,10 +185,11 @@ class HistoryNavRendererTest : public ClientAppRenderer::Delegate,
EXPECT_EQ(RT_SUB_RESOURCE, request->GetResourceType());
EXPECT_EQ(TT_EXPLICIT, request->GetTransitionType());
if (item.action == NA_LOAD)
if (item.action == NA_LOAD) {
EXPECT_EQ(NAVIGATION_OTHER, navigation_type);
else if (item.action == NA_BACK || item.action == NA_FORWARD)
} else if (item.action == NA_BACK || item.action == NA_FORWARD) {
EXPECT_EQ(NAVIGATION_BACK_FORWARD, navigation_type);
}
if (nav_ > 0) {
const NavListItem& last_item = kHNavList[nav_ - 1];
@@ -423,11 +424,12 @@ class HistoryNavTestHandler : public TestHandler {
EXPECT_STREQ(item.target, url.c_str());
EXPECT_EQ(RT_MAIN_FRAME, request->GetResourceType());
if (item.action == NA_LOAD)
if (item.action == NA_LOAD) {
EXPECT_EQ(TT_EXPLICIT, request->GetTransitionType());
else if (item.action == NA_BACK || item.action == NA_FORWARD)
} else if (item.action == NA_BACK || item.action == NA_FORWARD) {
EXPECT_EQ(TT_EXPLICIT | TT_FORWARD_BACK_FLAG,
request->GetTransitionType());
}
if (nav_ > 0) {
const NavListItem& last_item = kHNavList[nav_ - 1];
@@ -449,11 +451,12 @@ class HistoryNavTestHandler : public TestHandler {
const NavListItem& item = kHNavList[nav_];
EXPECT_EQ(RT_MAIN_FRAME, request->GetResourceType());
if (item.action == NA_LOAD)
if (item.action == NA_LOAD) {
EXPECT_EQ(TT_EXPLICIT, request->GetTransitionType());
else if (item.action == NA_BACK || item.action == NA_FORWARD)
} else if (item.action == NA_BACK || item.action == NA_FORWARD) {
EXPECT_EQ(TT_EXPLICIT | TT_FORWARD_BACK_FLAG,
request->GetTransitionType());
}
got_before_resource_load_[nav_].yes();
@@ -494,10 +497,11 @@ class HistoryNavTestHandler : public TestHandler {
got_load_start_[nav_].yes();
if (item.action == NA_LOAD)
if (item.action == NA_LOAD) {
EXPECT_EQ(TT_EXPLICIT, transition_type);
else if (item.action == NA_BACK || item.action == NA_FORWARD)
} else if (item.action == NA_BACK || item.action == NA_FORWARD) {
EXPECT_EQ(TT_EXPLICIT | TT_FORWARD_BACK_FLAG, transition_type);
}
std::string url1 = browser->GetMainFrame()->GetURL();
std::string url2 = frame->GetURL();