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

Replace CefRequestCallback with CefCallback (fixes issue #1861)

Browse Source 
CefRequestCallback::Continue(false) was the same as Cancel(), so we can just
use CefCallback instead.
This commit is contained in:
Marshall Greenblatt
2021-09-27 12:09:45 +03:00
parent 23be17f693
commit cbc5710801
33 changed files with 185 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/ceftests/resource_request_handler_unittest.cc
View File

@@ -612,7 +612,7 @@ class BasicResponseTest : public TestHandler {
CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request,
CefRefPtr<CefRequestCallback> callback) override {
CefRefPtr<CefCallback> callback) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
// Ignore favicon requests.
@@ -1382,7 +1382,7 @@ class BasicResponseTest : public TestHandler {
int resource_handler_destroyed_ct_ = 0;
// Used with INCOMPLETE_BEFORE_RESOURCE_LOAD.
CefRefPtr<CefRequestCallback> incomplete_callback_;
CefRefPtr<CefCallback> incomplete_callback_;
DISALLOW_COPY_AND_ASSIGN(BasicResponseTest);
IMPLEMENT_REFCOUNTING(BasicResponseTest);
@@ -1658,7 +1658,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request,
CefRefPtr<CefRequestCallback> callback) override {
CefRefPtr<CefCallback> callback) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
@@ -2578,7 +2578,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
int resource_handler_destroyed_ct_ = 0;
// Used with INCOMPLETE_BEFORE_RESOURCE_LOAD.
CefRefPtr<CefRequestCallback> incomplete_callback_;
CefRefPtr<CefCallback> incomplete_callback_;
DISALLOW_COPY_AND_ASSIGN(SubresourceResponseTest);
IMPLEMENT_REFCOUNTING(SubresourceResponseTest);
@@ -3040,7 +3040,7 @@ class RedirectResponseTest : public TestHandler {
CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request,
CefRefPtr<CefRequestCallback> callback) override {
CefRefPtr<CefCallback> callback) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() &&
@@ -3272,7 +3272,7 @@ class BeforeResourceLoadTest : public TestHandler {
CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request,
CefRefPtr<CefRequestCallback> callback) override {
CefRefPtr<CefCallback> callback) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
@@ -3301,11 +3301,14 @@ class BeforeResourceLoadTest : public TestHandler {
if (test_mode_ == CANCEL_NAV) {
// Cancel the request by navigating to a new URL.
browser->GetMainFrame()->LoadURL(kResourceTestHtml2);
} else if (test_mode_ == CONTINUE_ASYNC) {
// Continue asynchronously.
CefPostTask(TID_UI,
base::BindOnce(&CefCallback::Continue, callback.get()));
} else {
// Continue or cancel asynchronously.
CefPostTask(TID_UI, base::BindOnce(&CefRequestCallback::Continue,
callback.get(),
test_mode_ == CONTINUE_ASYNC));
// Cancel asynchronously.
CefPostTask(TID_UI,
base::BindOnce(&CefCallback::Cancel, callback.get()));
}
return RV_CONTINUE_ASYNC;
}