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

Remove CEF-specific integer and char16 typedef's (see #3507)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-06-01 17:06:15 +03:00
parent 695ee2a041
commit 5042d71408
150 changed files with 597 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/ceftests/resource_request_handler_unittest.cc
View File

@@ -129,7 +129,7 @@ class CallbackResourceHandler : public CefResourceHandler {
}
void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length,
int64_t& response_length,
CefString& redirectUrl) override {
response->SetStatus(status_code_);
response->SetStatusText(status_text_);
@@ -263,7 +263,7 @@ class IncompleteResourceHandlerOld : public CefResourceHandler {
}
void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length,
int64_t& response_length,
CefString& redirectUrl) override {
EXPECT_IO_THREAD();
EXPECT_EQ(test_mode_, BLOCK_READ_RESPONSE);
@@ -366,7 +366,7 @@ class IncompleteResourceHandler : public CefResourceHandler {
}
void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length,
int64_t& response_length,
CefString& redirectUrl) override {
EXPECT_IO_THREAD();
EXPECT_EQ(test_mode_, BLOCK_READ);
@@ -792,7 +792,7 @@ class BasicResponseTest : public TestHandler {
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response,
URLRequestStatus status,
int64 received_content_length) override {
int64_t received_content_length) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
@@ -810,7 +810,7 @@ class BasicResponseTest : public TestHandler {
EXPECT_EQ(0, received_content_length);
} else {
EXPECT_EQ(UR_SUCCESS, status);
EXPECT_EQ(static_cast<int64>(GetResponseBody().length()),
EXPECT_EQ(static_cast<int64_t>(GetResponseBody().length()),
received_content_length);
}
@@ -1379,7 +1379,7 @@ class BasicResponseTest : public TestHandler {
const bool unhandled_;
int browser_id_ = 0;
uint64 request_id_ = 0U;
uint64_t request_id_ = 0U;
int resource_handler_created_ct_ = 0;
@@ -1903,7 +1903,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response,
URLRequestStatus status,
int64 received_content_length) override {
int64_t received_content_length) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
@@ -1916,13 +1916,13 @@ class SubresourceResponseTest : public RoutingTestHandler {
if (IsMainURL(request->GetURL())) {
EXPECT_TRUE(frame->IsMain());
EXPECT_EQ(UR_SUCCESS, status);
EXPECT_EQ(static_cast<int64>(GetMainResponseBody().length()),
EXPECT_EQ(static_cast<int64_t>(GetMainResponseBody().length()),
received_content_length);
return;
} else if (IsSubURL(request->GetURL())) {
EXPECT_FALSE(frame->IsMain());
EXPECT_EQ(UR_SUCCESS, status);
EXPECT_EQ(static_cast<int64>(GetSubResponseBody().length()),
EXPECT_EQ(static_cast<int64_t>(GetSubResponseBody().length()),
received_content_length);
EXPECT_TRUE(subframe_);
return;
@@ -1937,7 +1937,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
EXPECT_EQ(0, received_content_length);
} else {
EXPECT_EQ(UR_SUCCESS, status);
EXPECT_EQ(static_cast<int64>(GetResponseBody().length()),
EXPECT_EQ(static_cast<int64_t>(GetResponseBody().length()),
received_content_length);
}
@@ -1988,7 +1988,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -2590,8 +2590,8 @@ class SubresourceResponseTest : public RoutingTestHandler {
const bool subframe_;
int browser_id_ = 0;
int64 frame_id_ = 0;
uint64 request_id_ = 0U;
int64_t frame_id_ = 0;
uint64_t request_id_ = 0U;
int resource_handler_created_ct_ = 0;
@@ -2866,7 +2866,7 @@ class RedirectResponseTest : public TestHandler {
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response,
URLRequestStatus status,
int64 received_content_length) {
int64_t received_content_length) {
EXPECT_TRUE(CheckUrl(request->GetURL()));
// Verify the response returned by GetResourceHandler.
@@ -3185,7 +3185,7 @@ class RedirectResponseTest : public TestHandler {
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response,
URLRequestStatus status,
int64 received_content_length) override {
int64_t received_content_length) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() &&
@@ -3213,8 +3213,8 @@ class RedirectResponseTest : public TestHandler {
private:
RedirectResponseTest* const test_;
uint64 main_request_id_ = 0U;
uint64 sub_request_id_ = 0U;
uint64_t main_request_id_ = 0U;
uint64_t sub_request_id_ = 0U;
IMPLEMENT_REFCOUNTING(ResourceRequestHandler);
DISALLOW_COPY_AND_ASSIGN(ResourceRequestHandler);
@@ -3557,7 +3557,7 @@ class ResponseFilterTestBase : public CefResponseFilter {
// Verify the output from the filter.
virtual void VerifyOutput(cef_urlrequest_status_t status,
int64 received_content_length,
int64_t received_content_length,
const std::string& received_content) {
EXPECT_TRUE(got_init_filter_);
EXPECT_GT(filter_count_, 0U);
@@ -3608,7 +3608,7 @@ class ResponseFilterPassThru : public ResponseFilterTestBase {
}
void VerifyOutput(cef_urlrequest_status_t status,
int64 received_content_length,
int64_t received_content_length,
const std::string& received_content) override {
ResponseFilterTestBase::VerifyOutput(status, received_content_length,
received_content);
@@ -3741,7 +3741,7 @@ class ResponseFilterNeedMore : public ResponseFilterTestBase {
}
void VerifyOutput(cef_urlrequest_status_t status,
int64 received_content_length,
int64_t received_content_length,
const std::string& received_content) override {
ResponseFilterTestBase::VerifyOutput(status, received_content_length,
received_content);
@@ -3829,7 +3829,7 @@ class ResponseFilterError : public ResponseFilterTestBase {
}
void VerifyOutput(cef_urlrequest_status_t status,
int64 received_content_length,
int64_t received_content_length,
const std::string& received_content) override {
ResponseFilterTestBase::VerifyOutput(status, received_content_length,
received_content);
@@ -3883,7 +3883,7 @@ class ResponseFilterTestHandler : public TestHandler {
CefRefPtr<CefRequest> request,
CefRefPtr<CefResponse> response,
URLRequestStatus status,
int64 received_content_length) override {
int64_t received_content_length) override {
EXPECT_IO_THREAD();
if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) {
@@ -3959,7 +3959,7 @@ class ResponseFilterTestHandler : public TestHandler {
TrackCallback got_load_end_;
URLRequestStatus status_;
int64 received_content_length_;
int64_t received_content_length_;
IMPLEMENT_REFCOUNTING(ResponseFilterTestHandler);
};