mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update source files for bracket style
This commit is contained in:
@@ -111,8 +111,9 @@ class TestVisitor : public CefCookieVisitor {
|
||||
bool& deleteCookie) override {
|
||||
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
|
||||
cookies_->push_back(cookie);
|
||||
if (delete_cookies_)
|
||||
if (delete_cookies_) {
|
||||
deleteCookie = true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -167,8 +168,9 @@ void CreateCookie(CefRefPtr<CefCookieManager> manager,
|
||||
CefRefPtr<CefWaitableEvent> event) {
|
||||
CefString(&cookie.name).FromASCII("my_cookie");
|
||||
CefString(&cookie.value).FromASCII("My Value");
|
||||
if (withDomain)
|
||||
if (withDomain) {
|
||||
CefString(&cookie.domain).FromASCII(kTestDomain);
|
||||
}
|
||||
CefString(&cookie.path).FromASCII(kTestPath);
|
||||
if (!sessionCookie) {
|
||||
cookie.has_expires = true;
|
||||
@@ -242,16 +244,18 @@ void GetCookie(CefRefPtr<CefCookieManager> manager,
|
||||
VisitUrlCookies(manager, kTestUrl, false, cookies, deleteCookies, event);
|
||||
|
||||
EXPECT_EQ(1U, cookies.size());
|
||||
if (cookies.size() != 1U)
|
||||
if (cookies.size() != 1U) {
|
||||
return;
|
||||
}
|
||||
|
||||
const CefCookie& cookie_read = cookies[0];
|
||||
EXPECT_EQ(CefString(&cookie_read.name), "my_cookie");
|
||||
EXPECT_EQ(CefString(&cookie_read.value), "My Value");
|
||||
if (withDomain)
|
||||
if (withDomain) {
|
||||
EXPECT_EQ(CefString(&cookie_read.domain), ".www.test.com");
|
||||
else
|
||||
} else {
|
||||
EXPECT_EQ(CefString(&cookie_read.domain), kTestDomain);
|
||||
}
|
||||
EXPECT_EQ(CefString(&cookie_read.path), kTestPath);
|
||||
EXPECT_EQ(cookie.has_expires, cookie_read.has_expires);
|
||||
EXPECT_EQ(cookie.expires.val, cookie_read.expires.val);
|
||||
@@ -379,8 +383,9 @@ void TestMultipleCookies(CefRefPtr<CefCookieManager> manager,
|
||||
VisitUrlCookies(manager, kTestUrl, false, cookies, false, event);
|
||||
|
||||
EXPECT_EQ(3U, cookies.size());
|
||||
if (cookies.size() != 3U)
|
||||
if (cookies.size() != 3U) {
|
||||
return;
|
||||
}
|
||||
|
||||
EXPECT_EQ(CefString(&cookies[0].name), "my_cookie0");
|
||||
EXPECT_EQ(CefString(&cookies[1].name), "my_cookie2");
|
||||
@@ -457,8 +462,9 @@ void TestAllCookies(CefRefPtr<CefCookieManager> manager,
|
||||
VisitAllCookies(manager, cookies, false, event);
|
||||
|
||||
EXPECT_EQ(2U, cookies.size());
|
||||
if (cookies.size() != 2U)
|
||||
if (cookies.size() != 2U) {
|
||||
return;
|
||||
}
|
||||
|
||||
EXPECT_EQ(CefString(&cookies[0].name), "my_cookie1");
|
||||
EXPECT_EQ(CefString(&cookies[0].value), "My Value 1");
|
||||
@@ -472,8 +478,9 @@ void TestAllCookies(CefRefPtr<CefCookieManager> manager,
|
||||
VisitUrlCookies(manager, kUrl1, false, cookies, false, event);
|
||||
|
||||
EXPECT_EQ(1U, cookies.size());
|
||||
if (cookies.size() != 1U)
|
||||
if (cookies.size() != 1U) {
|
||||
return;
|
||||
}
|
||||
|
||||
EXPECT_EQ(CefString(&cookies[0].name), "my_cookie1");
|
||||
EXPECT_EQ(CefString(&cookies[0].value), "My Value 1");
|
||||
@@ -483,8 +490,9 @@ void TestAllCookies(CefRefPtr<CefCookieManager> manager,
|
||||
VisitUrlCookies(manager, kUrl2, false, cookies, false, event);
|
||||
|
||||
EXPECT_EQ(1U, cookies.size());
|
||||
if (cookies.size() != 1U)
|
||||
if (cookies.size() != 1U) {
|
||||
return;
|
||||
}
|
||||
|
||||
EXPECT_EQ(CefString(&cookies[0].name), "my_cookie2");
|
||||
EXPECT_EQ(CefString(&cookies[0].value), "My Value 2");
|
||||
@@ -743,8 +751,9 @@ class CookieTestSchemeHandler : public TestHandler {
|
||||
CefRequest::HeaderMap headerMap;
|
||||
request->GetHeaderMap(headerMap);
|
||||
CefRequest::HeaderMap::iterator it = headerMap.find("Cookie");
|
||||
if (it != headerMap.end() && it->second == "name2=value2")
|
||||
if (it != headerMap.end() && it->second == "name2=value2") {
|
||||
handler_->got_process_request_cookie_.yes();
|
||||
}
|
||||
}
|
||||
|
||||
// Continue immediately.
|
||||
@@ -819,8 +828,9 @@ class CookieTestSchemeHandler : public TestHandler {
|
||||
CefRequest::HeaderMap headerMap;
|
||||
request->GetHeaderMap(headerMap);
|
||||
CefRequest::HeaderMap::iterator it = headerMap.find("Cookie");
|
||||
if (it != headerMap.end() && it->second == "name2=value2")
|
||||
if (it != headerMap.end() && it->second == "name2=value2") {
|
||||
handler_->got_create_cookie_.yes();
|
||||
}
|
||||
}
|
||||
|
||||
return new SchemeHandler(handler_);
|
||||
@@ -1430,12 +1440,14 @@ class CookieAccessTestHandler : public RoutingTestHandler,
|
||||
test_backend_(test_backend),
|
||||
scheme_(custom_scheme ? kCustomCookieScheme : GetCookieAccessScheme()),
|
||||
use_global_(use_global) {
|
||||
if (test_mode_ == BLOCK_ALL_COOKIES)
|
||||
if (test_mode_ == BLOCK_ALL_COOKIES) {
|
||||
CHECK(!use_global_);
|
||||
else if (test_mode_ == ALLOW_NO_HANDLER)
|
||||
} else if (test_mode_ == ALLOW_NO_HANDLER) {
|
||||
CHECK_NE(RESOURCE_HANDLER, test_backend_);
|
||||
if (test_backend_ == SERVER)
|
||||
}
|
||||
if (test_backend_ == SERVER) {
|
||||
CHECK(!custom_scheme);
|
||||
}
|
||||
}
|
||||
|
||||
void RunTest() override {
|
||||
@@ -1553,8 +1565,9 @@ class CookieAccessTestHandler : public RoutingTestHandler,
|
||||
CefRefPtr<CefRequest> request) override {
|
||||
EXPECT_IO_THREAD();
|
||||
|
||||
if (test_mode_ == ALLOW_NO_FILTER)
|
||||
if (test_mode_ == ALLOW_NO_FILTER) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -1567,8 +1580,9 @@ class CookieAccessTestHandler : public RoutingTestHandler,
|
||||
bool is_download,
|
||||
const CefString& request_initiator,
|
||||
bool& disable_default_handling) override {
|
||||
if (test_mode_ == ALLOW_NO_HANDLER)
|
||||
if (test_mode_ == ALLOW_NO_HANDLER) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -1763,10 +1777,11 @@ class CookieAccessTestHandler : public RoutingTestHandler,
|
||||
bool& deleteCookie) override {
|
||||
const std::string& name = CefString(&cookie.name);
|
||||
const std::string& value = CefString(&cookie.value);
|
||||
if (name == "name_js" && value == "value_js")
|
||||
if (name == "name_js" && value == "value_js") {
|
||||
handler_->cookie_js3_ct_++;
|
||||
else if (name == "name_net" && value == "value_net")
|
||||
} else if (name == "name_net" && value == "value_net") {
|
||||
handler_->cookie_net3_ct_++;
|
||||
}
|
||||
|
||||
// Clean up the cookies.
|
||||
deleteCookie = true;
|
||||
@@ -2215,10 +2230,11 @@ class CookieRestartTestHandler : public RoutingTestHandler,
|
||||
bool& deleteCookie) override {
|
||||
const std::string& name = CefString(&cookie.name);
|
||||
const std::string& value = CefString(&cookie.value);
|
||||
if (name == "name_js" && value == "value_js")
|
||||
if (name == "name_js" && value == "value_js") {
|
||||
handler_->cookie_manager_js_ct_++;
|
||||
else if (name == "name_net" && value == "value_net")
|
||||
} else if (name == "name_net" && value == "value_net") {
|
||||
handler_->cookie_manager_net_ct_++;
|
||||
}
|
||||
|
||||
// Clean up the cookies.
|
||||
deleteCookie = true;
|
||||
|
Reference in New Issue
Block a user