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

42
tests/ceftests/message_router_multi_query_unittest.cc
View File

@@ -284,7 +284,7 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler {
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -359,7 +359,7 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler {
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
EXPECT_TRUE(finalized_);
EXPECT_UI_THREAD();
@@ -490,11 +490,11 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler {
// Set in OnQuery and verified in OnNotify or OnQueryCanceled.
int browser_id;
int64 frame_id;
int64_t frame_id;
bool is_main_frame;
// Used when a query is canceled.
int64 query_id;
int64_t query_id;
CefRefPtr<Callback> callback;
TrackCallback got_query;
@@ -922,7 +922,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler,
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -935,7 +935,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler,
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
AssertMainBrowser(browser);
AssertMainFrame(frame);
@@ -1110,7 +1110,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -1150,7 +1150,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
// Verify that the correct handler is called for cancellation.
EXPECT_EQ(query_id_, query_id);
@@ -1171,7 +1171,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
private:
MultiQueryMultiHandlerTestHandler* test_handler_;
const int index_;
int64 query_id_;
int64_t query_id_;
};
MultiQueryMultiHandlerTestHandler(bool synchronous,
@@ -1203,7 +1203,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -1216,7 +1216,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
AssertMainBrowser(browser);
AssertMainFrame(frame);
@@ -1413,7 +1413,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler,
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -1429,7 +1429,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler,
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
EXPECT_TRUE(finalized_);
if (!running_) {
running_ = true;
@@ -1532,9 +1532,9 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler,
const int browser_id = browser->GetIdentifier();
// Always use the same ID for the main frame.
const int64 frame_id = frame->IsMain() ? -1 : frame->GetIdentifier();
const int64_t frame_id = frame->IsMain() ? -1 : frame->GetIdentifier();
const std::pair<int, int64>& id = std::make_pair(browser_id, frame_id);
const std::pair<int, int64_t>& id = std::make_pair(browser_id, frame_id);
// Remove the currently active manager, if any.
ManagerMap::iterator it2 = manager_map_.find(id);
@@ -1550,7 +1550,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler,
CefRefPtr<CefFrame> frame) const {
const int browser_id = browser->GetIdentifier();
// Always use the same ID for the main frame.
const int64 frame_id = frame->IsMain() ? -1 : frame->GetIdentifier();
const int64_t frame_id = frame->IsMain() ? -1 : frame->GetIdentifier();
// Find the manager in the active map.
ManagerMap::const_iterator it =
@@ -1584,7 +1584,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler,
private:
typedef std::vector<MultiQueryManager*> ManagerList;
// Map of (browser ID, frame ID) to manager.
typedef std::map<std::pair<int, int64>, MultiQueryManager*> ManagerMap;
typedef std::map<std::pair<int, int64_t>, MultiQueryManager*> ManagerMap;
// All managers that have been created.
ManagerList all_managers_;
@@ -1649,7 +1649,7 @@ class MultiQueryMultiFrameTestHandler : public SingleLoadTestHandler,
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -1662,7 +1662,7 @@ class MultiQueryMultiFrameTestHandler : public SingleLoadTestHandler,
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
AssertMainBrowser(browser);
EXPECT_FALSE(frame->IsMain());
@@ -1790,7 +1790,7 @@ class MultiQueryMultiLoadTestHandler
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id,
int64_t query_id,
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
@@ -1800,7 +1800,7 @@ class MultiQueryMultiLoadTestHandler
void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int64 query_id) override {
int64_t query_id) override {
manager_map_.OnQueryCanceled(browser, frame, query_id);
}