bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceftests: Format with clang-tidy (see #3632)

This commit is contained in:
Marshall Greenblatt 2024-01-20 12:00:09 -05:00
parent 0a64bb6f9b
commit befa827da1
57 changed files with 569 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ceftests/audio_output_unittest.cc
View File

@ -854,7 +854,7 @@ const char kToggleTestHtml[] =
class AudioOutputTest : public ClientAppBrowser::Delegate {
public:
AudioOutputTest() {}
AudioOutputTest() = default;
void OnBeforeCommandLineProcessing(
CefRefPtr<ClientAppBrowser> app,
@ -870,7 +870,7 @@ class AudioOutputTest : public ClientAppBrowser::Delegate {
class AudioTestHandler : public TestHandler, public CefAudioHandler {
public:
AudioTestHandler() {}
AudioTestHandler() = default;
void SetupAudioTest(const std::string& testUrl) {
// Add the resource.
@ -961,7 +961,7 @@ class AudioTestHandler : public TestHandler, public CefAudioHandler {
// A common base class for audio output tests.
class AudioOutputTestHandler : public AudioTestHandler {
public:
AudioOutputTestHandler() {}
AudioOutputTestHandler() = default;
void RunTest() override {
// Setup the resource.
@ -987,7 +987,7 @@ class AudioOutputTestHandler : public AudioTestHandler {
class AudioCloseBrowserTest : public AudioTestHandler {
public:
AudioCloseBrowserTest() {}
AudioCloseBrowserTest() = default;
void RunTest() override {
// Setup the resource.
@ -1028,7 +1028,7 @@ class AudioCloseBrowserTest : public AudioTestHandler {
// this nearly 15 seconds test run.
class AudioTogglePlaybackTest : public AudioTestHandler {
public:
AudioTogglePlaybackTest() {}
AudioTogglePlaybackTest() = default;
void RunTest() override {
// Add the resource.

10
tests/ceftests/browser_info_map_unittest.cc
View File

@ -10,7 +10,7 @@
namespace {
struct MyObject {
MyObject(int val = 0) : member(val) {}
explicit MyObject(int val = 0) : member(val) {}
int member;
};
@ -24,9 +24,9 @@ typedef CefBrowserInfoMap<int, MyObject, MyObjectTraits> MyObjectMap;
class MyVisitor : public MyObjectMap::Visitor {
public:
MyVisitor(bool remove = false,
int remove_browser_id = 0,
InfoIdType remove_info_id = 0)
explicit MyVisitor(bool remove = false,
int remove_browser_id = 0,
InfoIdType remove_info_id = 0)
: remove_(remove),
remove_browser_id_(remove_browser_id),
remove_info_id_(remove_info_id) {}
@ -680,7 +680,7 @@ namespace {
class MyHeapObject {
public:
MyHeapObject(int* destroy_ct) : destroy_ct_(destroy_ct) {}
explicit MyHeapObject(int* destroy_ct) : destroy_ct_(destroy_ct) {}
~MyHeapObject() { (*destroy_ct_)++; }
private:

4
tests/ceftests/certificate_error_unittest.cc
View File

@ -323,14 +323,14 @@ namespace {
class DirectMismatchedTest : public CertificateErrorTest {
public:
DirectMismatchedTest(bool continue_invalid_certificate)
explicit DirectMismatchedTest(bool continue_invalid_certificate)
: CertificateErrorTest(
/*cert_type=*/CEF_TEST_CERT_OK_DOMAIN,
/*expect_load_success=*/continue_invalid_certificate,
/*expect_certificate_error=*/true) {}
protected:
std::string GetStartURL() const {
std::string GetStartURL() const override {
// Load by IP address when the certificate expects a domain.
return client::AsciiStrReplace(server_origin(), "localhost", "127.0.0.1") +
"/index.html";

30
tests/ceftests/cookie_unittest.cc
View File

@ -579,7 +579,7 @@ const char* kCookieJSUrl2 = "https://tests/cookie2.html";
class CookieTestJSHandler : public TestHandler {
public:
CookieTestJSHandler() {}
CookieTestJSHandler() = default;
void RunTest() override {
std::string page =
@ -727,7 +727,7 @@ class CookieTestSchemeHandler : public TestHandler {
class SchemeHandler : public CefResourceHandler {
public:
explicit SchemeHandler(CookieTestSchemeHandler* handler)
: handler_(handler), offset_(0) {}
: handler_(handler) {}
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -805,7 +805,7 @@ class CookieTestSchemeHandler : public TestHandler {
private:
CookieTestSchemeHandler* handler_;
std::string content_;
size_t offset_;
size_t offset_ = 0;
std::string cookie_;
IMPLEMENT_REFCOUNTING(SchemeHandler);
@ -1114,11 +1114,11 @@ struct CookieAccessData {
class CookieAccessResponseHandler {
public:
CookieAccessResponseHandler() {}
CookieAccessResponseHandler() = default;
virtual void AddResponse(const std::string& url, CookieAccessData* data) = 0;
protected:
virtual ~CookieAccessResponseHandler() {}
virtual ~CookieAccessResponseHandler() = default;
};
std::string GetHeaderValue(const CefServer::HeaderMap& header_map,
@ -1134,8 +1134,7 @@ std::string GetHeaderValue(const CefServer::HeaderMap& header_map,
// Serves request responses.
class CookieAccessSchemeHandler : public CefResourceHandler {
public:
explicit CookieAccessSchemeHandler(CookieAccessData* data)
: data_(data), offset_(0) {}
explicit CookieAccessSchemeHandler(CookieAccessData* data) : data_(data) {}
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -1213,7 +1212,7 @@ class CookieAccessSchemeHandler : public CefResourceHandler {
// |data_| is not owned by this object.
CookieAccessData* data_;
size_t offset_;
size_t offset_ = 0;
IMPLEMENT_REFCOUNTING(CookieAccessSchemeHandler);
DISALLOW_COPY_AND_ASSIGN(CookieAccessSchemeHandler);
@ -1222,7 +1221,7 @@ class CookieAccessSchemeHandler : public CefResourceHandler {
class CookieAccessSchemeHandlerFactory : public CefSchemeHandlerFactory,
public CookieAccessResponseHandler {
public:
CookieAccessSchemeHandlerFactory() {}
CookieAccessSchemeHandlerFactory() = default;
CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
@ -1269,12 +1268,9 @@ class CookieAccessSchemeHandlerFactory : public CefSchemeHandlerFactory,
class CookieAccessServerHandler : public test_server::ObserverHelper,
public CookieAccessResponseHandler {
public:
CookieAccessServerHandler()
: initialized_(false),
expected_http_request_ct_(-1),
actual_http_request_ct_(0) {}
CookieAccessServerHandler() = default;
virtual ~CookieAccessServerHandler() { RunCompleteCallback(); }
~CookieAccessServerHandler() override { RunCompleteCallback(); }
// Must be called before CreateServer().
void AddResponse(const std::string& url, CookieAccessData* data) override {
@ -1381,7 +1377,7 @@ class CookieAccessServerHandler : public test_server::ObserverHelper,
typedef std::map<std::string, CookieAccessData*> ResponseDataMap;
ResponseDataMap data_map_;
bool initialized_;
bool initialized_ = false;
// Only accessed on the UI thread.
base::OnceClosure complete_callback_;
@ -1392,8 +1388,8 @@ class CookieAccessServerHandler : public test_server::ObserverHelper,
TrackCallback got_server_created_;
TrackCallback got_server_destroyed_;
int expected_http_request_ct_;
int actual_http_request_ct_;
int expected_http_request_ct_ = -1;
int actual_http_request_ct_ = 0;
std::string request_log_;

20
tests/ceftests/cors_unittest.cc
View File

@ -23,7 +23,7 @@ namespace {
// Browser-side app delegate.
class CorsBrowserTest : public client::ClientAppBrowser::Delegate {
public:
CorsBrowserTest() {}
CorsBrowserTest() = default;
void OnContextInitialized(CefRefPtr<client::ClientAppBrowser> app) override {
if (IsChromeRuntimeEnabled()) {
@ -156,7 +156,7 @@ struct Resource {
int success_query_ct = 0;
int failure_query_ct = 0;
Resource() {}
Resource() = default;
Resource(HandlerType request_handler,
const std::string& request_path,
const std::string& mime_type = kMimeTypeHtml,
@ -587,7 +587,7 @@ class CorsTestHandler : public RoutingTestHandler {
CEF_REQUIRE_UI_THREAD();
DCHECK(setup_->clear_cookies);
test_request::GetAllCookies(
CefCookieManager::GetGlobalManager(nullptr), /*delete_cookies=*/true,
CefCookieManager::GetGlobalManager(nullptr), /*deleteCookies=*/true,
base::BindOnce(&CorsTestHandler::ClearedCookies, this));
}
@ -713,7 +713,7 @@ TEST(CorsTest, BasicCustomStandardSchemeWithQuery) {
namespace {
struct CookieTestSetup : TestSetup {
CookieTestSetup() {}
CookieTestSetup() = default;
bool expect_cookie = false;
@ -733,13 +733,13 @@ struct CookieTestSetup : TestSetup {
};
struct CookieResource : Resource {
CookieResource() {}
CookieResource() = default;
bool expect_cookie = false;
void InitSetCookie() {
response->SetHeaderByName("Set-Cookie", kDefaultCookie,
/*override=*/true);
/*overwrite=*/true);
}
bool VerifyRequest(CefRefPtr<CefRequest> request) const override {
@ -976,7 +976,7 @@ const char kSubUnsafeHeaderName[] = "x-unsafe-header";
const char kSubUnsafeHeaderValue[] = "not-safe";
struct SubResource : CookieResource {
SubResource() {}
SubResource() = default;
std::string main_origin;
bool supports_cors = false;
@ -1525,7 +1525,7 @@ enum class RedirectMode {
};
struct RedirectGetResource : CookieResource {
RedirectGetResource() {}
RedirectGetResource() = default;
bool VerifyRequest(CefRefPtr<CefRequest> request) const override {
if (!CookieResource::VerifyRequest(request)) {
@ -1551,7 +1551,7 @@ void SetupRedirectResponse(RedirectMode mode,
}
response->SetHeaderByName("Location", redirect_url,
/*override=*/false);
/*overwrite=*/false);
}
// Test redirect requests.
@ -1663,7 +1663,7 @@ CORS_TEST_REDIRECT_GET_ALL(307, MODE_307)
namespace {
struct PostResource : CookieResource {
PostResource() {}
PostResource() = default;
bool expect_downgrade_to_get = false;
bool was_redirected = false;

4
tests/ceftests/devtools_message_unittest.cc
View File

@ -22,7 +22,7 @@ const char kTestUrl2[] = "https://tests/DevToolsMessage2";
class DevToolsMessageTestHandler : public TestHandler {
public:
DevToolsMessageTestHandler() {}
DevToolsMessageTestHandler() = default;
void RunTest() override {
// Add HTML resources.
@ -113,7 +113,7 @@ class DevToolsMessageTestHandler : public TestHandler {
explicit TestMessageObserver(DevToolsMessageTestHandler* handler)
: handler_(handler) {}
virtual ~TestMessageObserver() { handler_->observer_destroyed_.yes(); }
~TestMessageObserver() override { handler_->observer_destroyed_.yes(); }
bool OnDevToolsMessage(CefRefPtr<CefBrowser> browser,
const void* message,

13
tests/ceftests/dialog_unittest.cc
View File

@ -18,9 +18,7 @@ class DialogTestHandler : public TestHandler {
explicit TestConfig(FileDialogMode dialog_mode)
: mode(dialog_mode),
title("Test Title"),
default_file_name("Test File Name"),
callback_async(false),
callback_cancel(false) {
default_file_name("Test File Name") {
accept_types.push_back("text/*");
accept_types.push_back(".js");
accept_types.push_back(".css");
@ -31,9 +29,12 @@ class DialogTestHandler : public TestHandler {
CefString default_file_name;
std::vector<CefString> accept_types;
bool callback_async; // True if the callback should execute asynchronously.
bool callback_cancel; // True if the callback should cancel.
std::vector<CefString> callback_paths; // Resulting paths if not cancelled.
// True if the callback should execute asynchronously.
bool callback_async = false;
// True if the callback should cancel.
bool callback_cancel = false;
// Resulting paths if not cancelled.
std::vector<CefString> callback_paths;
};
class Callback : public CefRunFileDialogCallback {

20
tests/ceftests/display_unittest.cc
View File

@ -28,8 +28,7 @@ const char kTitleStr3[] = "Title 3";
// Browser side.
class TitleTestHandler : public TestHandler {
public:
TitleTestHandler()
: step_(0), got_title_change_(false), got_loading_state_change_(false) {}
TitleTestHandler() = default;
void RunTest() override {
// Add the resources that we will navigate to/from.
@ -130,10 +129,10 @@ class TitleTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
int step_;
int step_ = 0;
bool got_title_change_;
bool got_loading_state_change_;
bool got_title_change_ = false;
bool got_loading_state_change_ = false;
TrackCallback got_title_[5];
@ -155,7 +154,7 @@ const char kAutoResizeUrl[] = "https://tests-display/auto-resize.html";
class AutoResizeTestHandler : public RoutingTestHandler {
public:
AutoResizeTestHandler() {}
AutoResizeTestHandler() = default;
void RunTest() override {
// Add the resources that we will navigate to/from.
@ -260,18 +259,17 @@ class ConsoleTestHandler : public TestHandler {
: level(message_level),
message("'Test Message'"),
expected_message("Test Message"),
source("https://tests-console-message/level.html"),
line(42) {}
source("https://tests-console-message/level.html") {}
cef_log_severity_t level;
std::string message;
std::string expected_message;
std::string source;
int line;
int line = 42;
std::string function;
};
ConsoleTestHandler(const TestConfig& config) : config_(config) {}
explicit ConsoleTestHandler(const TestConfig& config) : config_(config) {}
void RunTest() override {
// Add the resources that will be used to print to console.
@ -469,7 +467,7 @@ const char kLoadinProgressUrl[] = "https://tests-display/loading-progress.html";
// Browser side.
class LoadingProgressTestHandler : public TestHandler {
public:
LoadingProgressTestHandler() {}
LoadingProgressTestHandler() = default;
void RunTest() override {
// Add the resources that we will navigate to/from.

2
tests/ceftests/dom_unittest.cc
View File

@ -264,7 +264,7 @@ class TestDOMVisitor : public CefDOMVisitor {
// Used in the render process.
class DOMRendererTest : public ClientAppRenderer::Delegate {
public:
DOMRendererTest() {}
DOMRendererTest() = default;
bool OnProcessMessageReceived(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,

16
tests/ceftests/download_unittest.cc
View File

@ -34,9 +34,7 @@ class DownloadSchemeHandler : public CefResourceHandler {
DownloadSchemeHandler(DelayCallback delay_callback,
TrackCallback* got_download_request)
: delay_callback_(std::move(delay_callback)),
got_download_request_(got_download_request),
should_delay_(false),
offset_(0) {}
got_download_request_(got_download_request) {}
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -128,11 +126,11 @@ class DownloadSchemeHandler : public CefResourceHandler {
DelayCallback delay_callback_;
TrackCallback* got_download_request_;
bool should_delay_;
bool should_delay_ = false;
std::string content_;
std::string mime_type_;
std::string content_disposition_;
size_t offset_;
size_t offset_ = 0;
CefRefPtr<CefResourceReadCallback> read_callback_;
IMPLEMENT_REFCOUNTING(DownloadSchemeHandler);
@ -182,9 +180,7 @@ class DownloadTestHandler : public TestHandler {
const std::string& rc_cache_path)
: test_mode_(test_mode),
rc_mode_(rc_mode),
rc_cache_path_(rc_cache_path),
download_id_(0),
verified_results_(false) {}
rc_cache_path_(rc_cache_path) {}
bool is_clicked() const {
return test_mode_ == CLICKED || test_mode_ == CLICKED_INVALID ||
@ -569,8 +565,8 @@ class DownloadTestHandler : public TestHandler {
std::string download_url_;
CefScopedTempDir temp_dir_;
std::string test_path_;
uint32_t download_id_;
bool verified_results_;
uint32_t download_id_ = 0;
bool verified_results_ = false;
bool destroyed_ = false;
TrackCallback got_download_request_;

20
tests/ceftests/extensions/chrome_tabs_unittest.cc
View File

@ -27,13 +27,7 @@ const char kSuccessMessage[] = "success";
class TabsTestHandler : public ExtensionTestHandler {
public:
explicit TabsTestHandler(RequestContextType request_context_type)
: ExtensionTestHandler(request_context_type),
create_main_browser_first_(false),
expect_get_active_browser_(true),
expect_success_in_main_browser_(true),
expected_api_call_count_(1),
got_get_active_browser_count_(0),
got_can_access_browser_count_(0) {}
: ExtensionTestHandler(request_context_type) {}
// CefExtensionHandler methods:
void OnExtensionLoaded(CefRefPtr<CefExtension> extension) override {
@ -335,20 +329,20 @@ class TabsTestHandler : public ExtensionTestHandler {
// If true the main browser will be created before the extension browser.
// Otherwise the creation order is undefined.
bool create_main_browser_first_;
bool create_main_browser_first_ = false;
// If true we expect GetActiveBrowser() but not CanAccessBrowser() to be
// called. Else visa-versa.
bool expect_get_active_browser_;
bool expect_get_active_browser_ = true;
// If true we expect the success message to be delivered in the main browser.
// Else expect it in the extension browser.
bool expect_success_in_main_browser_;
bool expect_success_in_main_browser_ = true;
// Number of expected calls to GetActiveBrowser or CanAccessBrowser. This
// should match the number of calls to chrome.tabs.* API functions in the
// test.
int expected_api_call_count_;
int expected_api_call_count_ = 1;
CefRefPtr<CefExtension> extension_;
std::string extension_url_;
@ -364,8 +358,8 @@ class TabsTestHandler : public ExtensionTestHandler {
TrackCallback got_success_message_;
TrackCallback got_extension_unloaded_;
int got_get_active_browser_count_;
int got_can_access_browser_count_;
int got_get_active_browser_count_ = 0;
int got_can_access_browser_count_ = 0;
};
//

8
tests/ceftests/extensions/extension_test_handler.cc
View File

@ -10,7 +10,7 @@
ExtensionTestHandler::ExtensionTestHandler(
RequestContextType request_context_type)
: request_context_type_(request_context_type), create_main_browser_(true) {
: request_context_type_(request_context_type) {
// Verify supported flag combinations.
if (request_context_on_disk()) {
EXPECT_TRUE(request_context_is_custom());
@ -79,7 +79,7 @@ void ExtensionTestHandler::RunTest() {
if (request_context_load_with_handler()) {
class Handler : public CefRequestContextHandler {
public:
Handler() {}
Handler() = default;
private:
IMPLEMENT_REFCOUNTING(Handler);
@ -207,8 +207,8 @@ void ExtensionTestHandler::VerifyExtensionInContext(
// has finished loading (our extension may load first if the call to
// LoadExtension initializes the request context).
bool has_extension = false;
for (size_t i = 0; i < extension_ids.size(); ++i) {
if (extension_ids[i] == extension_id) {
for (const auto& i : extension_ids) {
if (i == extension_id) {
has_extension = true;
break;
}

4
tests/ceftests/extensions/extension_test_handler.h
View File

@ -43,7 +43,7 @@ class ExtensionTestHandler : public RoutingTestHandler,
};
explicit ExtensionTestHandler(RequestContextType request_context_type);
virtual ~ExtensionTestHandler();
~ExtensionTestHandler() override;
// TestHandler methods:
void RunTest() override;
@ -146,7 +146,7 @@ class ExtensionTestHandler : public RoutingTestHandler,
CefRefPtr<CefRequestContext> loader_request_context_;
// If true expect creation of a main browser. Default is true.
bool create_main_browser_;
bool create_main_browser_ = true;
DISALLOW_COPY_AND_ASSIGN(ExtensionTestHandler);
};

7
tests/ceftests/frame_handler_unittest.cc
View File

@ -95,7 +95,7 @@ struct FrameStatus {
return ss.str();
}
FrameStatus(CefRefPtr<CefFrame> frame)
explicit FrameStatus(CefRefPtr<CefFrame> frame)
: frame_id_(frame->GetIdentifier()),
is_main_(frame->IsMain()),
ident_str_(GetFrameDebugString(frame)) {}
@ -510,7 +510,7 @@ const char kOrderMainUrl[] = "https://tests-frame-handler/main-order.html";
class OrderMainTestHandler : public RoutingTestHandler, public CefFrameHandler {
public:
OrderMainTestHandler(CompletionState* completion_state = nullptr)
explicit OrderMainTestHandler(CompletionState* completion_state = nullptr)
: RoutingTestHandler(completion_state) {}
CefRefPtr<CefFrameHandler> GetFrameHandler() override {
@ -801,7 +801,8 @@ const char kOrderMainUrlPrefix[] = "https://tests-frame-handler";
class NavigateOrderMainTestHandler : public OrderMainTestHandler {
public:
NavigateOrderMainTestHandler(bool cross_origin, int additional_nav_ct = 2)
explicit NavigateOrderMainTestHandler(bool cross_origin,
int additional_nav_ct = 2)
: cross_origin_(cross_origin), additional_nav_ct_(additional_nav_ct) {}
void RunTest() override {

109
tests/ceftests/frame_unittest.cc
View File

@ -108,7 +108,7 @@ class FrameNavExpectations {
FrameNavExpectations(int nav, bool renderer)
: nav_(nav), renderer_(renderer) {}
virtual ~FrameNavExpectations() {}
virtual ~FrameNavExpectations() = default;
// Browser and renderer notifications.
virtual bool OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
@ -207,8 +207,8 @@ class FrameNavExpectationsRenderer : public FrameNavExpectations {
// Abstract base class for the factory that creates expectations objects.
class FrameNavExpectationsFactory {
public:
FrameNavExpectationsFactory() {}
virtual ~FrameNavExpectationsFactory() {}
FrameNavExpectationsFactory() = default;
virtual ~FrameNavExpectationsFactory() = default;
// Returns the unique ID for this factory type.
virtual FrameNavFactoryId GetID() const = 0;
@ -217,7 +217,7 @@ class FrameNavExpectationsFactory {
// Browser process expectations factory abstact base class.
class FrameNavExpectationsFactoryBrowser : public FrameNavExpectationsFactory {
public:
FrameNavExpectationsFactoryBrowser() {}
FrameNavExpectationsFactoryBrowser() = default;
// Create a new factory instance of the specified type.
static std::unique_ptr<FrameNavExpectationsFactoryBrowser> FromID(
@ -246,7 +246,7 @@ class FrameNavExpectationsFactoryBrowser : public FrameNavExpectationsFactory {
// Renderer process expectations factory abstact base class.
class FrameNavExpectationsFactoryRenderer : public FrameNavExpectationsFactory {
public:
FrameNavExpectationsFactoryRenderer() {}
FrameNavExpectationsFactoryRenderer() = default;
// Create a new factory instance of the specified type.
static std::unique_ptr<FrameNavExpectationsFactoryRenderer> FromID(
@ -269,7 +269,7 @@ class FrameNavExpectationsFactoryRenderer : public FrameNavExpectationsFactory {
class FrameNavRendererTest : public ClientAppRenderer::Delegate,
public CefLoadHandler {
public:
FrameNavRendererTest() : run_test_(false), nav_(0) {}
FrameNavRendererTest() = default;
void OnBrowserCreated(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,
@ -359,8 +359,8 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate,
nav_++;
}
bool run_test_;
int nav_;
bool run_test_ = false;
int nav_ = 0;
std::unique_ptr<FrameNavExpectationsFactoryRenderer> factory_;
std::unique_ptr<FrameNavExpectationsRenderer> expectations_;
@ -371,8 +371,7 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate,
class FrameNavTestHandler : public TestHandler {
public:
explicit FrameNavTestHandler(FrameNavFactoryId factory_id)
: nav_(0),
factory_(FrameNavExpectationsFactoryBrowser::FromID(factory_id)) {}
: factory_(FrameNavExpectationsFactoryBrowser::FromID(factory_id)) {}
~FrameNavTestHandler() override { EXPECT_TRUE(got_destroyed_); }
@ -514,7 +513,7 @@ class FrameNavTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
int nav_;
int nav_ = 0;
TrackCallback got_destroyed_;
std::unique_ptr<FrameNavExpectationsFactoryBrowser> factory_;
std::unique_ptr<FrameNavExpectationsBrowser> expectations_;
@ -774,7 +773,7 @@ class FrameNavExpectationsRendererTestSingleNavHarness
class FrameNavExpectationsFactoryBrowserTestSingleNavHarness
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestSingleNavHarness() {}
FrameNavExpectationsFactoryBrowserTestSingleNavHarness() = default;
~FrameNavExpectationsFactoryBrowserTestSingleNavHarness() override {
EXPECT_TRUE(got_finalize_);
@ -815,7 +814,7 @@ class FrameNavExpectationsFactoryBrowserTestSingleNavHarness
class FrameNavExpectationsFactoryRendererTestSingleNavHarness
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestSingleNavHarness() {}
FrameNavExpectationsFactoryRendererTestSingleNavHarness() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_SINGLE_NAV_HARNESS; }
@ -1009,7 +1008,7 @@ class FrameNavExpectationsRendererTestSingleNav
class FrameNavExpectationsFactoryBrowserTestSingleNav
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestSingleNav() {}
FrameNavExpectationsFactoryBrowserTestSingleNav() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_SINGLE_NAV; }
@ -1026,7 +1025,7 @@ class FrameNavExpectationsFactoryBrowserTestSingleNav
class FrameNavExpectationsFactoryRendererTestSingleNav
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestSingleNav() {}
FrameNavExpectationsFactoryRendererTestSingleNav() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_SINGLE_NAV; }
@ -1177,7 +1176,7 @@ class FrameNavExpectationsBrowserTestMultiNavHarness
typedef FrameNavExpectationsBrowserMultiNav parent;
explicit FrameNavExpectationsBrowserTestMultiNavHarness(int nav)
: parent(nav), navigation_done_count_(0) {}
: parent(nav) {}
~FrameNavExpectationsBrowserTestMultiNavHarness() override {
EXPECT_TRUE(got_finalize_);
@ -1262,7 +1261,7 @@ class FrameNavExpectationsBrowserTestMultiNavHarness
TrackCallback got_load_end_;
TrackCallback got_on_after_created_;
TrackCallback got_renderer_complete_;
mutable int navigation_done_count_;
mutable int navigation_done_count_ = 0;
TrackCallback got_finalize_;
};
@ -1272,7 +1271,7 @@ class FrameNavExpectationsRendererTestMultiNavHarness
typedef FrameNavExpectationsRendererMultiNav parent;
explicit FrameNavExpectationsRendererTestMultiNavHarness(int nav)
: parent(nav), navigation_done_count_(0) {}
: parent(nav) {}
~FrameNavExpectationsRendererTestMultiNavHarness() override {
EXPECT_TRUE(got_finalize_);
@ -1314,15 +1313,14 @@ class FrameNavExpectationsRendererTestMultiNavHarness
private:
TrackCallback got_load_state_change_done_;
TrackCallback got_load_end_;
mutable int navigation_done_count_;
mutable int navigation_done_count_ = 0;
TrackCallback got_finalize_;
};
class FrameNavExpectationsFactoryBrowserTestMultiNavHarness
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestMultiNavHarness()
: get_browser_navigation_count_(0), create_count_(0) {}
FrameNavExpectationsFactoryBrowserTestMultiNavHarness() = default;
~FrameNavExpectationsFactoryBrowserTestMultiNavHarness() override {
EXPECT_TRUE(got_finalize_);
@ -1353,15 +1351,15 @@ class FrameNavExpectationsFactoryBrowserTestMultiNavHarness
}
private:
mutable int get_browser_navigation_count_;
int create_count_;
mutable int get_browser_navigation_count_ = 0;
int create_count_ = 0;
TrackCallback got_finalize_;
};
class FrameNavExpectationsFactoryRendererTestMultiNavHarness
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestMultiNavHarness() {}
FrameNavExpectationsFactoryRendererTestMultiNavHarness() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_MULTI_NAV_HARNESS; }
@ -1565,7 +1563,7 @@ class FrameNavExpectationsRendererTestMultiNav
class FrameNavExpectationsFactoryBrowserTestMultiNav
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestMultiNav() : nav_count_(0) {}
FrameNavExpectationsFactoryBrowserTestMultiNav() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_MULTI_NAV; }
@ -1586,13 +1584,13 @@ class FrameNavExpectationsFactoryBrowserTestMultiNav
}
private:
int nav_count_;
int nav_count_ = 0;
};
class FrameNavExpectationsFactoryRendererTestMultiNav
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestMultiNav() {}
FrameNavExpectationsFactoryRendererTestMultiNav() = default;
FrameNavFactoryId GetID() const override { return FNF_ID_MULTI_NAV; }
@ -1834,6 +1832,7 @@ class FrameNavExpectationsBrowserTestNestedIframes
case 2: {
// Frame 2. Contains an named iframe created via javascript.
std::stringstream ss;
// clang-format off
ss << "<html><script>"
<< " function createFrame() {"
<< " var f = document.createElement('iframe');"
@ -1841,6 +1840,7 @@ class FrameNavExpectationsBrowserTestNestedIframes
<< " f.src = '" << GetMultiNavURL(origin_, 3) << "';"
<< " document.body.appendChild(f);"
<< " }</script><body onload=\"createFrame()\">Nav3</body></html>";
// clang-format on
return ss.str();
}
case 3:
@ -2139,8 +2139,7 @@ class FrameNavExpectationsRendererTestNestedIframes
class FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin()
: create_count_(0) {}
FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin() = default;
FrameNavFactoryId GetID() const override {
return FNF_ID_NESTED_IFRAMES_SAME_ORIGIN;
@ -2164,13 +2163,13 @@ class FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin
}
private:
int create_count_;
int create_count_ = 0;
};
class FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin() {}
FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin() = default;
FrameNavFactoryId GetID() const override {
return FNF_ID_NESTED_IFRAMES_SAME_ORIGIN;
@ -2193,8 +2192,7 @@ namespace {
class FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin
: public FrameNavExpectationsFactoryBrowser {
public:
FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin()
: create_count_(0) {}
FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin() = default;
FrameNavFactoryId GetID() const override {
return FNF_ID_NESTED_IFRAMES_DIFF_ORIGIN;
@ -2218,13 +2216,13 @@ class FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin
}
private:
int create_count_;
int create_count_ = 0;
};
class FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin
: public FrameNavExpectationsFactoryRenderer {
public:
FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin() {}
FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin() = default;
FrameNavFactoryId GetID() const override {
return FNF_ID_NESTED_IFRAMES_DIFF_ORIGIN;
@ -2253,24 +2251,28 @@ FrameNavExpectationsFactoryBrowser::FromID(FrameNavFactoryId id) {
std::unique_ptr<FrameNavExpectationsFactoryBrowser> factory;
switch (id) {
case FNF_ID_SINGLE_NAV_HARNESS:
factory.reset(new FrameNavExpectationsFactoryBrowserTestSingleNavHarness);
factory = std::make_unique<
FrameNavExpectationsFactoryBrowserTestSingleNavHarness>();
break;
case FNF_ID_SINGLE_NAV:
factory.reset(new FrameNavExpectationsFactoryBrowserTestSingleNav);
factory =
std::make_unique<FrameNavExpectationsFactoryBrowserTestSingleNav>();
break;
case FNF_ID_MULTI_NAV_HARNESS:
factory.reset(new FrameNavExpectationsFactoryBrowserTestMultiNavHarness);
factory = std::make_unique<
FrameNavExpectationsFactoryBrowserTestMultiNavHarness>();
break;
case FNF_ID_MULTI_NAV:
factory.reset(new FrameNavExpectationsFactoryBrowserTestMultiNav);
factory =
std::make_unique<FrameNavExpectationsFactoryBrowserTestMultiNav>();
break;
case FNF_ID_NESTED_IFRAMES_SAME_ORIGIN:
factory.reset(
new FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin);
factory = std::make_unique<
FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin>();
break;
case FNF_ID_NESTED_IFRAMES_DIFF_ORIGIN:
factory.reset(
new FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin);
factory = std::make_unique<
FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin>();
break;
default:
break;
@ -2286,25 +2288,28 @@ FrameNavExpectationsFactoryRenderer::FromID(FrameNavFactoryId id) {
std::unique_ptr<FrameNavExpectationsFactoryRenderer> factory;
switch (id) {
case FNF_ID_SINGLE_NAV_HARNESS:
factory.reset(
new FrameNavExpectationsFactoryRendererTestSingleNavHarness);
factory = std::make_unique<
FrameNavExpectationsFactoryRendererTestSingleNavHarness>();
break;
case FNF_ID_SINGLE_NAV:
factory.reset(new FrameNavExpectationsFactoryRendererTestSingleNav);
factory =
std::make_unique<FrameNavExpectationsFactoryRendererTestSingleNav>();
break;
case FNF_ID_MULTI_NAV_HARNESS:
factory.reset(new FrameNavExpectationsFactoryRendererTestMultiNavHarness);
factory = std::make_unique<
FrameNavExpectationsFactoryRendererTestMultiNavHarness>();
break;
case FNF_ID_MULTI_NAV:
factory.reset(new FrameNavExpectationsFactoryRendererTestMultiNav);
factory =
std::make_unique<FrameNavExpectationsFactoryRendererTestMultiNav>();
break;
case FNF_ID_NESTED_IFRAMES_SAME_ORIGIN:
factory.reset(
new FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin);
factory = std::make_unique<
FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin>();
break;
case FNF_ID_NESTED_IFRAMES_DIFF_ORIGIN:
factory.reset(
new FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin);
factory = std::make_unique<
FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin>();
break;
default:
break;

19
tests/ceftests/life_span_unittest.cc
View File

@ -18,20 +18,15 @@ const char kUnloadMsg[] = "LifeSpanTestHandler.Unload";
class LifeSpanTestHandler : public RoutingTestHandler {
public:
struct Settings {
Settings()
: force_close(false),
add_onunload_handler(false),
allow_do_close(true),
accept_before_unload_dialog(true) {}
Settings() = default;
bool force_close;
bool add_onunload_handler;
bool allow_do_close;
bool accept_before_unload_dialog;
bool force_close = false;
bool add_onunload_handler = false;
bool allow_do_close = true;
bool accept_before_unload_dialog = true;
};
explicit LifeSpanTestHandler(const Settings& settings)
: settings_(settings), executing_delay_close_(false) {
explicit LifeSpanTestHandler(const Settings& settings) : settings_(settings) {
// By default no LifeSpan tests call DestroyTest().
SetDestroyTestExpected(false);
}
@ -176,7 +171,7 @@ class LifeSpanTestHandler : public RoutingTestHandler {
Settings settings_;
// Forces the window to close (bypasses test conditions).
bool executing_delay_close_;
bool executing_delay_close_ = false;
IMPLEMENT_REFCOUNTING(LifeSpanTestHandler);
};

4
tests/ceftests/media_access_unittest.cc
View File

@ -30,7 +30,7 @@ constexpr char kMediaNavUrl[] = "https://media-access-test/nav.html";
class MediaAccessBrowserTest : public client::ClientAppBrowser::Delegate,
public CefPermissionHandler {
public:
MediaAccessBrowserTest() {}
MediaAccessBrowserTest() = default;
void OnBeforeCommandLineProcessing(
CefRefPtr<client::ClientAppBrowser> app,
@ -46,7 +46,7 @@ class MediaAccessBrowserTest : public client::ClientAppBrowser::Delegate,
class TestSetup {
public:
TestSetup() {}
TestSetup() = default;
// CONFIGURATION

3
tests/ceftests/message_router_harness_unittest.cc
View File

@ -9,7 +9,8 @@ namespace {
// Used to verify that the test harness (bound functions) behave correctly.
class HarnessTestHandler : public SingleLoadTestHandler {
public:
HarnessTestHandler(bool test_success) : test_success_(test_success) {}
explicit HarnessTestHandler(bool test_success)
: test_success_(test_success) {}
std::string GetMainHTML() override {
std::string html;

87
tests/ceftests/message_router_multi_query_unittest.cc
View File

@ -75,7 +75,7 @@ class MultiQueryManager {
virtual void OnAllQueriesCompleted(MultiQueryManager* manager) {}
protected:
virtual ~Observer() {}
virtual ~Observer() = default;
};
MultiQueryManager(const std::string& label,
@ -86,13 +86,7 @@ class MultiQueryManager {
synchronous_(synchronous),
id_offset_(id_offset),
transfer_type_(transfer_type),
finalized_(false),
running_(false),
manual_total_(0),
received_count_(0),
manual_complete_count_(0),
auto_complete_count_(0),
will_cancel_by_removing_handler_(false),
weak_ptr_factory_(this) {}
std::string label() const { return label_; }
@ -111,7 +105,7 @@ class MultiQueryManager {
// thread.
void AddTestQuery(TestType type) {
EXPECT_FALSE(finalized_);
test_query_vector_.push_back(TestQuery(type));
test_query_vector_.emplace_back(type);
if (!IsAuto(type)) {
manual_total_++;
}
@ -503,22 +497,17 @@ class MultiQueryManager {
private:
struct TestQuery {
explicit TestQuery(TestType test_type)
: type(test_type),
browser_id(0),
frame_id(0),
is_main_frame(false),
query_id(0) {}
explicit TestQuery(TestType test_type) : type(test_type) {}
TestType type;
// Set in OnQuery and verified in OnNotify or OnQueryCanceled.
int browser_id;
int64_t frame_id;
bool is_main_frame;
int browser_id = 0;
int64_t frame_id = 0;
bool is_main_frame = false;
// Used when a query is canceled.
int64_t query_id;
int64_t query_id = 0;
CefRefPtr<CefMessageRouterBrowserSide::Callback> callback;
TrackCallback got_query;
@ -858,23 +847,23 @@ class MultiQueryManager {
ObserverSet observer_set_;
// Set to true after all queries have been added.
bool finalized_;
bool finalized_ = false;
// Set to true while queries are pending.
bool running_;
bool running_ = false;
// Total number of queries that will manually complete.
int manual_total_;
int manual_total_ = 0;
// Number of queries that have been received.
int received_count_;
int received_count_ = 0;
// Number of queries that have completed successfully.
int manual_complete_count_;
int auto_complete_count_;
int manual_complete_count_ = 0;
int auto_complete_count_ = 0;
// If true any pending queries will receive an onFailure callback in addition
// to be canceled.
bool will_cancel_by_removing_handler_;
bool will_cancel_by_removing_handler_ = false;
// Should always be the last member.
base::WeakPtrFactory<MultiQueryManager> weak_ptr_factory_;
@ -902,8 +891,8 @@ void MakeTestQueries(MultiQueryManager* manager,
MultiQueryManager::PERSISTENT_SUCCESS,
MultiQueryManager::FAILURE,
};
for (size_t i = 0; i < sizeof(types) / sizeof(types[0]); ++i) {
manager->AddTestQuery(types[i]);
for (auto& type : types) {
manager->AddTestQuery(type);
}
} else {
// Test every type of query.
@ -1163,7 +1152,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
class Handler : public CefMessageRouterBrowserSide::Handler {
public:
Handler(MultiQueryMultiHandlerTestHandler* test_handler, int index)
: test_handler_(test_handler), index_(index), query_id_(0) {}
: test_handler_(test_handler), index_(index) {}
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
@ -1228,7 +1217,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler,
private:
MultiQueryMultiHandlerTestHandler* test_handler_;
const int index_;
int64_t query_id_;
int64_t query_id_ = 0;
};
MultiQueryMultiHandlerTestHandler(bool synchronous,
@ -1414,16 +1403,12 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
virtual void OnMapAllQueriesCompleted(MultiQueryManagerMap* map) {}
protected:
virtual ~Observer() {}
virtual ~Observer() = default;
};
MultiQueryManagerMap()
: finalized_(false),
running_(false),
manual_complete_count_(0),
total_complete_count_(0) {}
MultiQueryManagerMap() = default;
virtual ~MultiQueryManagerMap() { RemoveAllManagers(); }
~MultiQueryManagerMap() override { RemoveAllManagers(); }
void AddObserver(Observer* observer) {
EXPECT_FALSE(running_);
@ -1461,8 +1446,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
std::string html = "<html><body>\n";
for (size_t i = 0; i < all_managers_.size(); ++i) {
const std::string& url = all_managers_[i]->label();
for (auto all_manager : all_managers_) {
const std::string& url = all_manager->label();
const std::string& name = GetNameForURL(url);
html += "<iframe id=\"" + name + "\" src=\"" + url + "\"></iframe>\n";
}
@ -1555,8 +1540,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
bool AllComplete() const {
EXPECT_TRUE(finalized_);
for (size_t i = 0; i < all_managers_.size(); ++i) {
if (!all_managers_[i]->IsAllComplete()) {
for (auto all_manager : all_managers_) {
if (!all_manager->IsAllComplete()) {
return false;
}
}
@ -1568,14 +1553,14 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
EXPECT_TRUE(pending_managers_.empty());
EXPECT_FALSE(running_);
for (size_t i = 0; i < all_managers_.size(); ++i) {
all_managers_[i]->AssertAllComplete();
for (auto all_manager : all_managers_) {
all_manager->AssertAllComplete();
}
}
bool HasAutoQueries() const {
for (size_t i = 0; i < all_managers_.size(); ++i) {
if (all_managers_[i]->HasAutoQueries()) {
for (auto all_manager : all_managers_) {
if (all_manager->HasAutoQueries()) {
return true;
}
}
@ -1639,8 +1624,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
return;
}
for (size_t i = 0; i < all_managers_.size(); ++i) {
delete all_managers_[i];
for (auto& all_manager : all_managers_) {
delete all_manager;
}
all_managers_.clear();
manager_map_.clear();
@ -1670,13 +1655,13 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
ObserverSet observer_set_;
// Set to true after all query managers have been added.
bool finalized_;
bool finalized_ = false;
// Set to true while queries are pending.
bool running_;
bool running_ = false;
// Number of managers that have completed.
int manual_complete_count_;
int total_complete_count_;
int manual_complete_count_ = 0;
int total_complete_count_ = 0;
};
// Test multiple queries in a single page load with multiple frames.

10
tests/ceftests/message_router_single_query_unittest.cc
View File

@ -21,7 +21,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler {
};
SingleQueryTestHandler(TestType type, bool sync_callback)
: test_type_(type), sync_callback_(sync_callback), query_id_(0) {}
: test_type_(type), sync_callback_(sync_callback) {}
std::string GetMainHTML() override {
std::string html;
@ -210,7 +210,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler {
const TestType test_type_;
const bool sync_callback_;
int64_t query_id_;
int64_t query_id_ = 0;
CefRefPtr<Callback> callback_;
TrackCallback got_on_query_;
@ -273,7 +273,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler {
};
SinglePersistentQueryTestHandler(TestType test_type, bool sync_callback)
: test_type_(test_type), sync_callback_(sync_callback), query_id_(0) {}
: test_type_(test_type), sync_callback_(sync_callback) {}
std::string GetMainHTML() override {
std::string html;
@ -468,7 +468,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler {
const TestType test_type_;
const bool sync_callback_;
int64_t query_id_;
int64_t query_id_ = 0;
CefRefPtr<Callback> callback_;
TrackCallback got_on_query_;
@ -519,7 +519,7 @@ namespace {
// Test a single unhandled query in a single page load.
class SingleUnhandledQueryTestHandler : public SingleLoadTestHandler {
public:
SingleUnhandledQueryTestHandler() {}
SingleUnhandledQueryTestHandler() = default;
std::string GetMainHTML() override {
std::string html;

108
tests/ceftests/navigation_unittest.cc
View File

@ -87,7 +87,7 @@ static NavListItem kHNavList[] = {
class HistoryNavRendererTest : public ClientAppRenderer::Delegate,
public CefLoadHandler {
public:
HistoryNavRendererTest() : run_test_(false), nav_(0) {}
HistoryNavRendererTest() = default;
void OnBrowserCreated(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,
@ -221,8 +221,8 @@ class HistoryNavRendererTest : public ClientAppRenderer::Delegate,
nav_++;
}
bool run_test_;
int nav_;
bool run_test_ = false;
int nav_ = 0;
TrackCallback got_loading_state_start_;
TrackCallback got_loading_state_end_;
@ -235,12 +235,7 @@ class HistoryNavRendererTest : public ClientAppRenderer::Delegate,
class NavigationEntryVisitor : public CefNavigationEntryVisitor {
public:
NavigationEntryVisitor(int nav, TrackCallback* callback)
: nav_(nav),
callback_(callback),
expected_total_(0),
expected_current_index_(-1),
expected_forwardback_(),
callback_count_(0) {
: nav_(nav), callback_(callback) {
// Determine the expected values.
for (int i = 0; i <= nav_; ++i) {
if (kHNavList[i].action == NA_LOAD) {
@ -312,10 +307,10 @@ class NavigationEntryVisitor : public CefNavigationEntryVisitor {
private:
const int nav_;
TrackCallback* callback_;
int expected_total_;
int expected_current_index_;
bool expected_forwardback_[3]; // Only 3 loads total.
int callback_count_;
int expected_total_ = 0;
int expected_current_index_ = -1;
bool expected_forwardback_[3] = {}; // Only 3 loads total.
int callback_count_ = 0;
IMPLEMENT_REFCOUNTING(NavigationEntryVisitor);
};
@ -653,7 +648,7 @@ const char kDynIfrNav2[] = "https://tests-dynframe/nav2.html";
// Browser side.
class HistoryDynamicIFramesNavTestHandler : public TestHandler {
public:
HistoryDynamicIFramesNavTestHandler() : nav_(-1) {}
HistoryDynamicIFramesNavTestHandler() = default;
void RunTest() override {
// Add the resources that we will navigate to/from.
@ -756,7 +751,7 @@ class HistoryDynamicIFramesNavTestHandler : public TestHandler {
RunNav(browser);
}
int nav_;
int nav_ = -1;
TrackCallback got_load_start_[4];
TrackCallback got_load_end_[4];
@ -794,7 +789,7 @@ bool g_got_invalid_request = false;
class RedirectSchemeHandler : public CefResourceHandler {
public:
RedirectSchemeHandler() : offset_(0), status_(0) {}
RedirectSchemeHandler() = default;
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -885,8 +880,8 @@ class RedirectSchemeHandler : public CefResourceHandler {
protected:
std::string content_;
size_t offset_;
int status_;
size_t offset_ = 0;
int status_ = 0;
std::string location_;
IMPLEMENT_REFCOUNTING(RedirectSchemeHandler);
@ -916,7 +911,7 @@ class RedirectSchemeHandlerFactory : public CefSchemeHandlerFactory {
class RedirectTestHandler : public TestHandler {
public:
RedirectTestHandler() {}
RedirectTestHandler() = default;
void RunTest() override {
// Create the browser.
@ -1046,7 +1041,7 @@ class RedirectTestHandler : public TestHandler {
// Like above but destroy the WebContents while the redirect is in-progress.
class RedirectDestroyTestHandler : public TestHandler {
public:
RedirectDestroyTestHandler() {}
RedirectDestroyTestHandler() = default;
void RunTest() override {
// Create the browser.
@ -1221,11 +1216,7 @@ class OrderNavRendererTest : public ClientAppRenderer::Delegate,
public CefLoadHandler {
public:
OrderNavRendererTest()
: run_test_(false),
browser_id_main_(0),
browser_id_popup_(0),
state_main_(false, false),
state_popup_(true, false) {}
: state_main_(false, false), state_popup_(true, false) {}
void OnWebKitInitialized(CefRefPtr<ClientAppRenderer> app) override {
EXPECT_FALSE(got_webkit_initialized_);
@ -1414,10 +1405,10 @@ class OrderNavRendererTest : public ClientAppRenderer::Delegate,
frame->SendProcessMessage(PID_BROWSER, return_msg);
}
bool run_test_;
bool run_test_ = false;
int browser_id_main_;
int browser_id_popup_;
int browser_id_main_ = 0;
int browser_id_popup_ = 0;
CefRefPtr<CefBrowser> browser_main_;
TrackCallback got_webkit_initialized_;
TrackCallback got_browser_created_main_;
@ -1434,12 +1425,7 @@ class OrderNavRendererTest : public ClientAppRenderer::Delegate,
// Browser side.
class OrderNavTestHandler : public TestHandler {
public:
OrderNavTestHandler()
: browser_id_main_(0),
browser_id_popup_(0),
state_main_(false, true),
state_popup_(true, true),
got_message_(false) {}
OrderNavTestHandler() : state_main_(false, true), state_popup_(true, true) {}
// Returns state that will be checked in the renderer process via
// OrderNavRendererTest::OnBrowserCreated.
@ -1681,8 +1667,8 @@ class OrderNavTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
int browser_id_main_;
int browser_id_popup_;
int browser_id_main_ = 0;
int browser_id_popup_ = 0;
CefRefPtr<CefBrowser> browser_popup_;
TrackCallback got_before_browse_main_;
@ -1691,7 +1677,7 @@ class OrderNavTestHandler : public TestHandler {
OrderNavLoadState state_main_;
OrderNavLoadState state_popup_;
bool got_message_;
bool got_message_ = false;
IMPLEMENT_REFCOUNTING(OrderNavTestHandler);
};
@ -2255,11 +2241,7 @@ const size_t kSimultPopupCount = 5U;
// Test multiple popups simultaniously.
class PopupSimultaneousTestHandler : public TestHandler {
public:
explicit PopupSimultaneousTestHandler(bool same_url)
: same_url_(same_url),
before_popup_ct_(0U),
after_created_ct_(0U),
before_close_ct_(0U) {}
explicit PopupSimultaneousTestHandler(bool same_url) : same_url_(same_url) {}
void RunTest() override {
std::string main_html = "<html><script>\n";
@ -2381,12 +2363,12 @@ class PopupSimultaneousTestHandler : public TestHandler {
const bool same_url_;
std::string popup_url_[kSimultPopupCount];
size_t before_popup_ct_;
size_t before_popup_ct_ = 0U;
int browser_id_[kSimultPopupCount];
size_t after_created_ct_;
size_t after_created_ct_ = 0U;
TrackCallback got_loading_state_change_[kSimultPopupCount];
TrackCallback got_before_close_[kSimultPopupCount];
size_t before_close_ct_;
size_t before_close_ct_ = 0U;
IMPLEMENT_REFCOUNTING(PopupSimultaneousTestHandler);
};
@ -2580,7 +2562,7 @@ const char kPopupJSEmptyMainUrl[] = "https://www.tests-pjse.com/main.html";
// Test creation of a popup where the URL is empty.
class PopupJSWindowEmptyTestHandler : public TestHandler {
public:
PopupJSWindowEmptyTestHandler() {}
PopupJSWindowEmptyTestHandler() = default;
void RunTest() override {
AddResource(kPopupJSEmptyMainUrl, "<html>Main</html>", "text/html");
@ -2688,7 +2670,7 @@ const char kBrowseNavPageUrl[] = "https://tests-browsenav/nav.html";
// Browser side.
class BrowseNavTestHandler : public TestHandler {
public:
BrowseNavTestHandler(bool allow) : allow_(allow), destroyed_(false) {}
explicit BrowseNavTestHandler(bool allow) : allow_(allow) {}
void RunTest() override {
AddResource(kBrowseNavPageUrl, "<html>Test</html>", "text/html");
@ -2819,7 +2801,7 @@ class BrowseNavTestHandler : public TestHandler {
}
bool allow_;
bool destroyed_;
bool destroyed_ = false;
TrackCallback got_before_browse_;
TrackCallback got_load_start_;
@ -2854,7 +2836,7 @@ const char kSameNavPageUrl[] = "https://tests-samenav/nav.html";
// Browser side.
class SameNavTestHandler : public TestHandler {
public:
SameNavTestHandler() : destroyed_(false), step_(0) {}
SameNavTestHandler() = default;
void RunTest() override {
AddResource(kSameNavPageUrl, "<html>Test</html>", "text/html");
@ -2984,8 +2966,8 @@ class SameNavTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
bool destroyed_;
int step_;
bool destroyed_ = false;
int step_ = 0;
std::string expected_url_;
TrackCallback got_before_browse_;
@ -3014,7 +2996,7 @@ const char kCancelPageUrl[] = "https://tests-cancelnav/nav.html";
// A scheme handler that never starts sending data.
class UnstartedSchemeHandler : public CefResourceHandler {
public:
UnstartedSchemeHandler() {}
UnstartedSchemeHandler() = default;
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -3059,7 +3041,7 @@ class UnstartedSchemeHandler : public CefResourceHandler {
// Browser side.
class CancelBeforeNavTestHandler : public TestHandler {
public:
CancelBeforeNavTestHandler() : destroyed_(false) {}
CancelBeforeNavTestHandler() = default;
void RunTest() override {
// Create the browser.
@ -3204,7 +3186,7 @@ class CancelBeforeNavTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
bool destroyed_;
bool destroyed_ = false;
TrackCallback got_loading_state_changed_start_;
TrackCallback got_before_browse_;
@ -3234,7 +3216,7 @@ namespace {
// A scheme handler that stalls after writing some data.
class StalledSchemeHandler : public CefResourceHandler {
public:
StalledSchemeHandler() : offset_(0), write_size_(0) {}
StalledSchemeHandler() = default;
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -3293,8 +3275,8 @@ class StalledSchemeHandler : public CefResourceHandler {
protected:
std::string content_;
size_t offset_;
size_t write_size_;
size_t offset_ = 0;
size_t write_size_ = 0;
CefRefPtr<CefResourceReadCallback> callback_;
IMPLEMENT_REFCOUNTING(StalledSchemeHandler);
@ -3304,7 +3286,7 @@ class StalledSchemeHandler : public CefResourceHandler {
// Browser side.
class CancelAfterNavTestHandler : public TestHandler {
public:
CancelAfterNavTestHandler() : destroyed_(false) {}
CancelAfterNavTestHandler() = default;
void RunTest() override {
// Create the browser.
@ -3496,7 +3478,7 @@ class CancelAfterNavTestHandler : public TestHandler {
TestHandler::DestroyTest();
}
bool destroyed_;
bool destroyed_ = false;
TrackCallback got_loading_state_changed_start_;
TrackCallback got_before_browse_;
@ -3545,7 +3527,7 @@ void SetBrowserExtraInfo(CefRefPtr<CefDictionaryValue> extra_info) {
// Renderer side
class ExtraInfoNavRendererTest : public ClientAppRenderer::Delegate {
public:
ExtraInfoNavRendererTest() : run_test_(false) {}
ExtraInfoNavRendererTest() = default;
void OnBrowserCreated(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,
@ -3578,14 +3560,14 @@ class ExtraInfoNavRendererTest : public ClientAppRenderer::Delegate {
frame->SendProcessMessage(PID_BROWSER, return_msg);
}
bool run_test_;
bool run_test_ = false;
IMPLEMENT_REFCOUNTING(ExtraInfoNavRendererTest);
};
class ExtraInfoNavTestHandler : public TestHandler {
public:
ExtraInfoNavTestHandler() : popup_opened_(false) {}
ExtraInfoNavTestHandler() = default;
void RunTest() override {
AddResource(kExtraInfoUrl,
@ -3667,7 +3649,7 @@ class ExtraInfoNavTestHandler : public TestHandler {
}
protected:
bool popup_opened_;
bool popup_opened_ = false;
TrackCallback got_process_message_main_;
TrackCallback got_process_message_popup_;

8
tests/ceftests/osr_accessibility_unittest.cc
View File

@ -37,8 +37,8 @@ class AccessibilityTestHandler : public TestHandler,
public CefRenderHandler,
public CefAccessibilityHandler {
public:
AccessibilityTestHandler(const AccessibilityTestType& type)
: test_type_(type), edit_box_id_(-1), accessibility_disabled_(false) {}
explicit AccessibilityTestHandler(const AccessibilityTestType& type)
: test_type_(type) {}
CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() override {
return this;
@ -424,8 +424,8 @@ class AccessibilityTestHandler : public TestHandler,
}
AccessibilityTestType test_type_;
int edit_box_id_;
bool accessibility_disabled_;
int edit_box_id_ = -1;
bool accessibility_disabled_ = false;
TrackCallback got_hide_edit_box_;
TrackCallback got_accessibility_location_change_;

86
tests/ceftests/osr_display_unittest.cc
View File

@ -20,7 +20,7 @@ const int kOsrHeight = 400;
class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler {
public:
DisplayTestHandler() : status_(START) {}
DisplayTestHandler() = default;
CefRefPtr<CefRenderHandler> GetRenderHandler() override { return this; }
@ -158,7 +158,7 @@ class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler {
SHOW,
STATUS_COUNT,
};
Status status_;
Status status_ = START;
TrackCallback got_paint_[STATUS_COUNT];
TrackCallback got_start_msg_;
@ -184,25 +184,22 @@ const char kOsrPopupJSOtherClientMainUrl[] =
class OsrPopupJSOtherClientTestHandler : public TestHandler,
public CefRenderHandler {
public:
OsrPopupJSOtherClientTestHandler(CefRefPtr<CefClient> other) {
explicit OsrPopupJSOtherClientTestHandler(CefRefPtr<CefClient> other) {
other_ = other;
}
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() override {
return this;
}
CefRefPtr<CefRenderHandler> GetRenderHandler() override { return this; }
virtual void GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) override {
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override {
rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
}
virtual void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
void RunTest() override {
AddResource(kOsrPopupJSOtherClientMainUrl, "<html>Main</html>",
@ -323,61 +320,56 @@ class OsrPopupJSOtherCefClient : public CefClient,
handler_ = handler;
}
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() override { return this; }
CefRefPtr<CefLoadHandler> GetLoadHandler() override { return this; }
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() override {
return this;
}
CefRefPtr<CefRenderHandler> GetRenderHandler() override { return this; }
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override {
return this;
}
CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override { return this; }
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading,
bool canGoBack,
bool canGoForward) override {
void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading,
bool canGoBack,
bool canGoForward) override {
if (handler_) {
handler_->OnLoadingStateChange(browser, isLoading, canGoBack,
canGoForward);
}
}
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) override {
void OnAfterCreated(CefRefPtr<CefBrowser> browser) override {
handler_->OnAfterCreated(browser);
}
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override {
void OnBeforeClose(CefRefPtr<CefBrowser> browser) override {
handler_->OnBeforeClose(browser);
handler_ = nullptr;
}
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& target_url,
const CefString& target_frame_name,
cef_window_open_disposition_t target_disposition,
bool user_gesture,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue>& extra_info,
bool* no_javascript_access) override {
bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& target_url,
const CefString& target_frame_name,
cef_window_open_disposition_t target_disposition,
bool user_gesture,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue>& extra_info,
bool* no_javascript_access) override {
return true;
}
virtual void GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) override {
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override {
rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
}
virtual void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
private:
CefRefPtr<OsrPopupJSOtherClientTestHandler> handler_;

2
tests/ceftests/permission_prompt_unittest.cc
View File

@ -27,7 +27,7 @@ constexpr char kPromptNavUrl[] = "https://permission-prompt-test/nav.html";
class TestSetup {
public:
TestSetup() {}
TestSetup() = default;
// CONFIGURATION

4
tests/ceftests/preference_unittest.cc
View File

@ -75,7 +75,7 @@ CefRefPtr<CefValue> CreateDictionaryValue(CefRefPtr<CefDictionaryValue> value) {
// Browser-side app delegate.
class PreferenceBrowserTest : public client::ClientAppBrowser::Delegate {
public:
PreferenceBrowserTest() {}
PreferenceBrowserTest() = default;
void OnRegisterCustomPreferences(
CefRefPtr<client::ClientAppBrowser> app,
@ -416,7 +416,7 @@ void ValidateGet(CefRefPtr<CefPreferenceManager> context,
// No-op implementation.
class TestRequestContextHandler : public CefRequestContextHandler {
public:
TestRequestContextHandler() {}
TestRequestContextHandler() = default;
explicit TestRequestContextHandler(CefRefPtr<CefWaitableEvent> event)
: event_(event) {}

4
tests/ceftests/print_unittest.cc
View File

@ -31,8 +31,8 @@ TEST(PrintTest, SettingsSetGet) {
EXPECT_EQ(dpi, settings->GetDPI());
CefPrintSettings::PageRangeList page_ranges;
page_ranges.push_back(CefRange(1, 3));
page_ranges.push_back(CefRange(5, 6));
page_ranges.emplace_back(1, 3);
page_ranges.emplace_back(5, 6);
settings->SetPageRanges(page_ranges);
EXPECT_EQ(page_ranges.size(), settings->GetPageRangesCount());
CefPrintSettings::PageRangeList page_ranges2;

2
tests/ceftests/process_message_unittest.cc
View File

@ -47,7 +47,7 @@ CefRefPtr<CefProcessMessage> CreateTestMessage() {
// Renderer side.
class SendRecvRendererTest : public ClientAppRenderer::Delegate {
public:
SendRecvRendererTest() {}
SendRecvRendererTest() = default;
bool OnProcessMessageReceived(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,

2
tests/ceftests/request_context_unittest.cc
View File

@ -33,7 +33,7 @@ TEST(RequestContextTest, BasicGetGlobal) {
TEST(RequestContextTest, BasicCreate) {
class Handler : public CefRequestContextHandler {
public:
Handler() {}
Handler() = default;
private:
IMPLEMENT_REFCOUNTING(Handler);

4
tests/ceftests/request_handler_unittest.cc
View File

@ -403,7 +403,7 @@ class NetNotifyTestHandler : public TestHandler {
class NetNotifyRendererTest : public ClientAppRenderer::Delegate,
public CefLoadHandler {
public:
NetNotifyRendererTest() : run_test_(false) {}
NetNotifyRendererTest() = default;
void OnBrowserCreated(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,
@ -461,7 +461,7 @@ class NetNotifyRendererTest : public ClientAppRenderer::Delegate,
}
private:
bool run_test_;
bool run_test_ = false;
IMPLEMENT_REFCOUNTING(NetNotifyRendererTest);
};

14
tests/ceftests/request_unittest.cc
View File

@ -218,7 +218,7 @@ void CreateRequest(CefRefPtr<CefRequest>& request) {
class RequestSendRecvTestHandler : public TestHandler {
public:
RequestSendRecvTestHandler() : response_length_(0), request_id_(0U) {}
RequestSendRecvTestHandler() = default;
void RunTest() override {
// Create the test request.
@ -356,8 +356,8 @@ class RequestSendRecvTestHandler : public TestHandler {
}
CefRefPtr<CefRequest> request_;
int64_t response_length_;
uint64_t request_id_;
int64_t response_length_ = 0;
uint64_t request_id_ = 0U;
TrackCallback got_before_resource_load_;
TrackCallback got_resource_handler_;
@ -515,9 +515,7 @@ class TypeTestHandler : public TestHandler {
TypeTestHandler()
: browse_expectations_(true),
load_expectations_(false),
get_expectations_(false),
completed_browser_side_(false),
destroyed_(false) {}
get_expectations_(false) {}
void RunTest() override {
AddResource(std::string(kTypeTestOrigin) + "main.html",
@ -616,8 +614,8 @@ class TypeTestHandler : public TestHandler {
TypeExpectations load_expectations_;
TypeExpectations get_expectations_;
bool completed_browser_side_;
bool destroyed_;
bool completed_browser_side_ = false;
bool destroyed_ = false;
IMPLEMENT_REFCOUNTING(TypeTestHandler);
};

21
tests/ceftests/resource_manager_unittest.cc
View File

@ -57,7 +57,7 @@ const char kNotHandled[] = "NotHandled";
class ResourceManagerTestHandler : public RoutingTestHandler {
public:
struct State {
State() : manager_(new CefResourceManager()), expected_message_ct_(0) {}
State() : manager_(new CefResourceManager()) {}
CefRefPtr<CefResourceManager> manager_;
@ -69,11 +69,10 @@ class ResourceManagerTestHandler : public RoutingTestHandler {
// If non-zero the test will not complete until the expected number of
// messages have been received.
size_t expected_message_ct_;
size_t expected_message_ct_ = 0;
};
explicit ResourceManagerTestHandler(State* state)
: state_(state), current_url_(0) {
explicit ResourceManagerTestHandler(State* state) : state_(state) {
EXPECT_TRUE(state_);
EXPECT_TRUE(state_->manager_.get());
EXPECT_TRUE(!state_->urls_.empty());
@ -162,7 +161,7 @@ class ResourceManagerTestHandler : public RoutingTestHandler {
}
State* state_;
size_t current_url_;
size_t current_url_ = 0;
IMPLEMENT_REFCOUNTING(ResourceManagerTestHandler);
};
@ -205,7 +204,7 @@ class TestProvider : public CefResourceManager::Provider {
explicit TestProvider(State* state) : state_(state) { EXPECT_TRUE(state_); }
~TestProvider() {
~TestProvider() override {
CEF_REQUIRE_IO_THREAD();
state_->got_destruct_.yes();
if (!state_->destruct_callback_.is_null()) {
@ -894,13 +893,11 @@ class OneShotProvider : public CefResourceManager::Provider {
public:
OneShotProvider(const std::string& content,
base::OnceClosure destruct_callback)
: done_(false),
content_(content),
destruct_callback_(std::move(destruct_callback)) {
: content_(content), destruct_callback_(std::move(destruct_callback)) {
EXPECT_FALSE(content.empty());
}
~OneShotProvider() {
~OneShotProvider() override {
CEF_REQUIRE_IO_THREAD();
std::move(destruct_callback_).Run();
}
@ -924,7 +921,7 @@ class OneShotProvider : public CefResourceManager::Provider {
}
private:
bool done_;
bool done_ = false;
std::string content_;
base::OnceClosure destruct_callback_;
@ -999,7 +996,7 @@ namespace {
// Content provider that returns the path component as the result.
class EchoProvider : public CefResourceManager::Provider {
public:
EchoProvider(const std::string& base_url) : base_url_(base_url) {
explicit EchoProvider(const std::string& base_url) : base_url_(base_url) {
EXPECT_TRUE(!base_url_.empty());
}

38
tests/ceftests/resource_request_handler_unittest.cc
View File

@ -2695,11 +2695,11 @@ class RedirectResponseTest : public TestHandler {
RedirectResponseTest(TestMode mode, bool via_request_context_handler)
: via_request_context_handler_(via_request_context_handler) {
if (mode == URL) {
resource_test_.reset(new UrlResourceTest);
resource_test_ = std::make_unique<UrlResourceTest>();
} else if (mode == HEADER) {
resource_test_.reset(new HeaderResourceTest);
resource_test_ = std::make_unique<HeaderResourceTest>();
} else {
resource_test_.reset(new PostResourceTest);
resource_test_ = std::make_unique<PostResourceTest>();
}
}
@ -2787,18 +2787,18 @@ class RedirectResponseTest : public TestHandler {
class ResourceTest {
public:
ResourceTest(const std::string& start_url,
size_t expected_resource_response_ct = 2U,
size_t expected_before_resource_load_ct = 1U,
size_t expected_resource_redirect_ct = 0U,
size_t expected_resource_load_complete_ct = 1U)
explicit ResourceTest(const std::string& start_url,
size_t expected_resource_response_ct = 2U,
size_t expected_before_resource_load_ct = 1U,
size_t expected_resource_redirect_ct = 0U,
size_t expected_resource_load_complete_ct = 1U)
: start_url_(start_url),
expected_resource_response_ct_(expected_resource_response_ct),
expected_before_resource_load_ct_(expected_before_resource_load_ct),
expected_resource_redirect_ct_(expected_resource_redirect_ct),
expected_resource_load_complete_ct_(
expected_resource_load_complete_ct) {}
virtual ~ResourceTest() {}
virtual ~ResourceTest() = default;
const std::string& start_url() const { return start_url_; }
@ -3526,7 +3526,7 @@ std::string CreateOutput(const std::string& content, size_t repeat_ct) {
// Base class for test filters.
class ResponseFilterTestBase : public CefResponseFilter {
public:
ResponseFilterTestBase() : filter_count_(0U) {}
ResponseFilterTestBase() = default;
bool InitFilter() override {
EXPECT_FALSE(got_init_filter_);
@ -3570,7 +3570,7 @@ class ResponseFilterTestBase : public CefResponseFilter {
protected:
TrackCallback got_init_filter_;
size_t filter_count_;
size_t filter_count_ = 0U;
IMPLEMENT_REFCOUNTING(ResponseFilterTestBase);
};
@ -3646,11 +3646,7 @@ const char kReplaceString[] = "This is the replaced string!";
// tests/shared/response_filter_test.cc.
class ResponseFilterNeedMore : public ResponseFilterTestBase {
public:
ResponseFilterNeedMore()
: find_match_offset_(0U),
replace_overflow_size_(0U),
input_size_(0U),
repeat_ct_(0U) {}
ResponseFilterNeedMore() = default;
FilterStatus Filter(void* data_in,
size_t data_in_size,
@ -3793,25 +3789,25 @@ class ResponseFilterNeedMore : public ResponseFilterTestBase {
}
// The portion of the find string that is currently matching.
size_t find_match_offset_;
size_t find_match_offset_ = 0U;
// The likely amount of overflow.
size_t replace_overflow_size_;
size_t replace_overflow_size_ = 0U;
// Overflow from the output buffer.
std::string overflow_;
// The original input size.
size_t input_size_;
size_t input_size_ = 0U;
// The number of times the find string was repeated.
size_t repeat_ct_;
size_t repeat_ct_ = 0U;
};
// Return a filter error.
class ResponseFilterError : public ResponseFilterTestBase {
public:
ResponseFilterError() {}
ResponseFilterError() = default;
FilterStatus Filter(void* data_in,
size_t data_in_size,

6
tests/ceftests/resource_util_win_idmap.cc
View File

@ -21,9 +21,9 @@ int GetResourceId(const char* resource_name) {
{"window_icon.2x.png", IDS_WINDOW_ICON_2X_PNG},
};
for (size_t i = 0; i < sizeof(resource_map) / sizeof(_resource_map); ++i) {
if (!strcmp(resource_map[i].name, resource_name)) {
return resource_map[i].id;
for (auto& i : resource_map) {
if (!strcmp(i.name, resource_name)) {
return i.id;
}
}

2
tests/ceftests/routing_test_handler.cc
View File

@ -17,7 +17,7 @@ void SetRouterConfig(CefMessageRouterConfig& config) {
// Handle the renderer side of the routing implementation.
class RoutingRenderDelegate : public ClientAppRenderer::Delegate {
public:
RoutingRenderDelegate() {}
RoutingRenderDelegate() = default;
void OnWebKitInitialized(CefRefPtr<ClientAppRenderer> app) override {
// Create the renderer-side router for query handling.

2
tests/ceftests/routing_test_handler.h
View File

@ -15,7 +15,7 @@
class RoutingTestHandler : public TestHandler,
public CefMessageRouterBrowserSide::Handler {
public:
RoutingTestHandler(CompletionState* completion_state = nullptr);
explicit RoutingTestHandler(CompletionState* completion_state = nullptr);
void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;

16
tests/ceftests/run_all_unittests.cc
View File

@ -2,6 +2,8 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include <memory>
#include "include/base/cef_build.h"
#include "include/cef_config.h"
@ -92,13 +94,11 @@ void ContinueOnUIThread(CefRefPtr<CefTaskRunner> test_task_runner) {
#if defined(OS_LINUX) && defined(CEF_X11)
int XErrorHandlerImpl(Display* display, XErrorEvent* event) {
LOG(WARNING) << "X error received: "
<< "type " << event->type << ", "
<< "serial " << event->serial << ", "
<< "error_code " << static_cast<int>(event->error_code) << ", "
<< "request_code " << static_cast<int>(event->request_code)
<< ", "
<< "minor_code " << static_cast<int>(event->minor_code);
LOG(WARNING) << "X error received: " << "type " << event->type << ", "
<< "serial " << event->serial << ", " << "error_code "
<< static_cast<int>(event->error_code) << ", " << "request_code "
<< static_cast<int>(event->request_code) << ", " << "minor_code "
<< static_cast<int>(event->minor_code);
return 0;
}
@ -210,7 +210,7 @@ int main(int argc, char* argv[]) {
if (settings.external_message_pump) {
message_loop = client::MainMessageLoopExternalPump::Create();
} else {
message_loop.reset(new client::MainMessageLoopStd);
message_loop = std::make_unique<client::MainMessageLoopStd>();
}
}

18
tests/ceftests/scheme_handler_unittest.cc
View File

@ -231,8 +231,7 @@ class TestSchemeHandler : public TestHandler {
class ClientSchemeHandlerOld : public CefResourceHandler {
public:
explicit ClientSchemeHandlerOld(TestResults* tr)
: test_results_(tr), offset_(0), is_sub_(false), has_delayed_(false) {}
explicit ClientSchemeHandlerOld(TestResults* tr) : test_results_(tr) {}
bool ProcessRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefCallback> callback) override {
@ -404,9 +403,9 @@ class ClientSchemeHandlerOld : public CefResourceHandler {
}
TestResults* const test_results_;
size_t offset_;
bool is_sub_;
bool has_delayed_;
size_t offset_ = 0;
bool is_sub_ = false;
bool has_delayed_ = false;
IMPLEMENT_REFCOUNTING(ClientSchemeHandlerOld);
DISALLOW_COPY_AND_ASSIGN(ClientSchemeHandlerOld);
@ -414,8 +413,7 @@ class ClientSchemeHandlerOld : public CefResourceHandler {
class ClientSchemeHandler : public CefResourceHandler {
public:
explicit ClientSchemeHandler(TestResults* tr)
: test_results_(tr), offset_(0), is_sub_(false), has_delayed_(false) {}
explicit ClientSchemeHandler(TestResults* tr) : test_results_(tr) {}
bool Open(CefRefPtr<CefRequest> request,
bool& handle_request,
@ -626,9 +624,9 @@ class ClientSchemeHandler : public CefResourceHandler {
}
TestResults* const test_results_;
size_t offset_;
bool is_sub_;
bool has_delayed_;
size_t offset_ = 0;
bool is_sub_ = false;
bool has_delayed_ = false;
IMPLEMENT_REFCOUNTING(ClientSchemeHandler);
DISALLOW_COPY_AND_ASSIGN(ClientSchemeHandler);

72
tests/ceftests/server_unittest.cc
View File

@ -40,7 +40,7 @@ class TestServerHandler : public CefServerHandler {
// The methods of this class are always executed on the server thread.
class HttpRequestHandler {
public:
virtual ~HttpRequestHandler() {}
virtual ~HttpRequestHandler() = default;
virtual bool HandleRequest(CefRefPtr<CefServer> server,
int connection_id,
const CefString& client_address,
@ -53,7 +53,7 @@ class TestServerHandler : public CefServerHandler {
// The methods of this class are always executed on the server thread.
class WsRequestHandler {
public:
virtual ~WsRequestHandler() {}
virtual ~WsRequestHandler() = default;
virtual bool HandleRequest(CefRefPtr<CefServer> server,
int connection_id,
const CefString& client_address,
@ -75,23 +75,12 @@ class TestServerHandler : public CefServerHandler {
// object is destroyed.
TestServerHandler(base::OnceClosure start_callback,
base::OnceClosure destroy_callback)
: initialized_(false),
start_callback_(std::move(start_callback)),
destroy_callback_(std::move(destroy_callback)),
expected_connection_ct_(0),
actual_connection_ct_(0),
expected_http_request_ct_(0),
actual_http_request_ct_(0),
expected_ws_request_ct_(0),
actual_ws_request_ct_(0),
expected_ws_connected_ct_(0),
actual_ws_connected_ct_(0),
expected_ws_message_ct_(0),
actual_ws_message_ct_(0) {
: start_callback_(std::move(start_callback)),
destroy_callback_(std::move(destroy_callback)) {
EXPECT_FALSE(destroy_callback_.is_null());
}
virtual ~TestServerHandler() {
~TestServerHandler() override {
EXPECT_UI_THREAD();
if (!http_request_handler_list_.empty()) {
@ -430,7 +419,7 @@ class TestServerHandler : public CefServerHandler {
CefRefPtr<CefServer> server_;
CefRefPtr<CefTaskRunner> server_runner_;
bool initialized_;
bool initialized_ = false;
// After initialization only accessed on the UI thread.
base::OnceClosure start_callback_;
@ -445,16 +434,16 @@ class TestServerHandler : public CefServerHandler {
typedef std::set<int> ConnectionIdSet;
ConnectionIdSet connection_id_set_;
int expected_connection_ct_;
int actual_connection_ct_;
int expected_connection_ct_ = 0;
int actual_connection_ct_ = 0;
// HTTP
typedef std::list<HttpRequestHandler*> HttpRequestHandlerList;
HttpRequestHandlerList http_request_handler_list_;
int expected_http_request_ct_;
int actual_http_request_ct_;
int expected_http_request_ct_ = 0;
int actual_http_request_ct_ = 0;
// WebSocket
@ -463,14 +452,14 @@ class TestServerHandler : public CefServerHandler {
ConnectionIdSet ws_connection_id_set_;
int expected_ws_request_ct_;
int actual_ws_request_ct_;
int expected_ws_request_ct_ = 0;
int actual_ws_request_ct_ = 0;
int expected_ws_connected_ct_;
int actual_ws_connected_ct_;
int expected_ws_connected_ct_ = 0;
int actual_ws_connected_ct_ = 0;
int expected_ws_message_ct_;
int actual_ws_message_ct_;
int expected_ws_message_ct_ = 0;
int actual_ws_message_ct_ = 0;
IMPLEMENT_REFCOUNTING(TestServerHandler);
DISALLOW_COPY_AND_ASSIGN(TestServerHandler);
@ -485,7 +474,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
// The methods of this class are always executed on the UI thread.
class RequestRunner {
public:
virtual ~RequestRunner() {}
virtual ~RequestRunner() = default;
// Create the server-side handler for the request.
virtual std::unique_ptr<TestServerHandler::HttpRequestHandler>
@ -500,10 +489,8 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
// If |parallel_requests| is true all requests will be run at the same time,
// otherwise one request will be run at a time.
HttpTestRunner(bool parallel_requests)
: parallel_requests_(parallel_requests),
initialized_(false),
next_request_id_(0) {}
explicit HttpTestRunner(bool parallel_requests)
: parallel_requests_(parallel_requests) {}
virtual ~HttpTestRunner() {
if (destroy_event_) {
@ -645,7 +632,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
TestHandler::UIThreadHelper* GetUIThreadHelper() {
EXPECT_UI_THREAD();
if (!ui_thread_helper_) {
ui_thread_helper_.reset(new TestHandler::UIThreadHelper());
ui_thread_helper_ = std::make_unique<TestHandler::UIThreadHelper>();
}
return ui_thread_helper_.get();
}
@ -675,11 +662,11 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
CefRefPtr<CefWaitableEvent> run_event_;
CefRefPtr<CefWaitableEvent> destroy_event_;
CefRefPtr<TestServerHandler> handler_;
bool initialized_;
bool initialized_ = false;
// After initialization the below members are only accessed on the UI thread.
int next_request_id_;
int next_request_id_ = 0;
// Map of request ID to RequestRunner.
typedef std::map<int, RequestRunner*> RequestRunnerMap;
@ -698,8 +685,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
struct HttpServerResponse {
enum Type { TYPE_200, TYPE_404, TYPE_500, TYPE_CUSTOM };
explicit HttpServerResponse(Type response_type)
: type(response_type), no_content_length(false) {}
explicit HttpServerResponse(Type response_type) : type(response_type) {}
Type type;
@ -713,7 +699,7 @@ struct HttpServerResponse {
// Used with CUSTOM response type.
int response_code;
CefServer::HeaderMap extra_headers;
bool no_content_length;
bool no_content_length = false;
};
void SendHttpServerResponse(CefRefPtr<CefServer> server,
@ -841,7 +827,7 @@ class StaticHttpServerRequestHandler
const HttpServerResponse& response)
: expected_request_(expected_request),
expected_request_ct_(expected_request_ct),
actual_request_ct_(0),
response_(response) {}
bool HandleRequest(CefRefPtr<CefServer> server,
@ -870,7 +856,7 @@ class StaticHttpServerRequestHandler
private:
CefRefPtr<CefRequest> expected_request_;
int expected_request_ct_;
int actual_request_ct_;
int actual_request_ct_ = 0;
HttpServerResponse response_;
DISALLOW_COPY_AND_ASSIGN(StaticHttpServerRequestHandler);
@ -1188,7 +1174,7 @@ const char kDoneMsgPrefix[] = "done:";
class WebSocketTestHandler : public RoutingTestHandler {
public:
WebSocketTestHandler() {}
WebSocketTestHandler() = default;
void RunTest() override {
handler_ = new TestServerHandler(
@ -1290,7 +1276,7 @@ class WebSocketTestHandler : public RoutingTestHandler {
class EchoWebSocketRequestHandler : public TestServerHandler::WsRequestHandler {
public:
explicit EchoWebSocketRequestHandler(int expected_message_ct)
: expected_message_ct_(expected_message_ct), actual_message_ct_(0) {}
: expected_message_ct_(expected_message_ct) {}
std::string GetWebSocketUrl() { return GetTestServerOrigin(true) + "/echo"; }
@ -1332,7 +1318,7 @@ class EchoWebSocketRequestHandler : public TestServerHandler::WsRequestHandler {
private:
int expected_message_ct_;
int actual_message_ct_;
int actual_message_ct_ = 0;
DISALLOW_COPY_AND_ASSIGN(EchoWebSocketRequestHandler);
};

12
tests/ceftests/stream_resource_handler_unittest.cc
View File

@ -23,8 +23,7 @@ const size_t kReadDesiredSize = 100U * 1024U; // 100k
class ReadHandler : public CefReadHandler {
public:
explicit ReadHandler(bool may_block)
: may_block_(may_block), offset_(0), expected_result_(0) {}
explicit ReadHandler(bool may_block) : may_block_(may_block) {}
void CreateContent() {
// To verify that the data transers successfully we're going to make a big
@ -78,16 +77,15 @@ class ReadHandler : public CefReadHandler {
private:
const bool may_block_;
std::string content_;
size_t offset_;
int expected_result_;
size_t offset_ = 0;
int expected_result_ = 0;
IMPLEMENT_REFCOUNTING(ReadHandler);
};
class ReadTestHandler : public RoutingTestHandler {
public:
explicit ReadTestHandler(bool may_block)
: may_block_(may_block), expected_result_(0) {}
explicit ReadTestHandler(bool may_block) : may_block_(may_block) {}
void RunTest() override {
// Create the browser.
@ -157,7 +155,7 @@ class ReadTestHandler : public RoutingTestHandler {
const bool may_block_;
int expected_result_;
int expected_result_ = 0;
TrackCallback got_resource_handler_;
TrackCallback got_on_query_;
TrackCallback got_on_loading_state_change_done_;

58
tests/ceftests/stream_unittest.cc
View File

@ -161,16 +161,7 @@ bool g_ReadHandlerTesterDeleted = false;
class ReadHandlerTester : public CefReadHandler {
public:
ReadHandlerTester()
: read_called_(false),
read_ptr_(nullptr),
read_size_(0),
read_n_(0),
seek_called_(false),
seek_offset_(0),
seek_whence_(0),
tell_called_(false),
eof_called_(false) {}
ReadHandlerTester() = default;
~ReadHandlerTester() override { g_ReadHandlerTesterDeleted = true; }
size_t Read(void* ptr, size_t size, size_t n) override {
@ -200,18 +191,18 @@ class ReadHandlerTester : public CefReadHandler {
bool MayBlock() override { return false; }
bool read_called_;
const void* read_ptr_;
size_t read_size_;
size_t read_n_;
bool read_called_ = false;
const void* read_ptr_ = nullptr;
size_t read_size_ = 0;
size_t read_n_ = 0;
bool seek_called_;
int64_t seek_offset_;
int seek_whence_;
bool seek_called_ = false;
int64_t seek_offset_ = 0;
int seek_whence_ = 0;
bool tell_called_;
bool tell_called_ = false;
bool eof_called_;
bool eof_called_ = false;
IMPLEMENT_REFCOUNTING(ReadHandlerTester);
};
@ -266,16 +257,7 @@ bool g_WriteHandlerTesterDeleted = false;
class WriteHandlerTester : public CefWriteHandler {
public:
WriteHandlerTester()
: write_called_(false),
write_ptr_(nullptr),
write_size_(0),
write_n_(0),
seek_called_(false),
seek_offset_(0),
seek_whence_(0),
tell_called_(false),
flush_called_(false) {}
WriteHandlerTester() = default;
~WriteHandlerTester() override { g_WriteHandlerTesterDeleted = true; }
size_t Write(const void* ptr, size_t size, size_t n) override {
@ -305,18 +287,18 @@ class WriteHandlerTester : public CefWriteHandler {
bool MayBlock() override { return false; }
bool write_called_;
const void* write_ptr_;
size_t write_size_;
size_t write_n_;
bool write_called_ = false;
const void* write_ptr_ = nullptr;
size_t write_size_ = 0;
size_t write_n_ = 0;
bool seek_called_;
int64_t seek_offset_;
int seek_whence_;
bool seek_called_ = false;
int64_t seek_offset_ = 0;
int seek_whence_ = 0;
bool tell_called_;
bool tell_called_ = false;
bool flush_called_;
bool flush_called_ = false;
IMPLEMENT_REFCOUNTING(WriteHandlerTester);
};

6
tests/ceftests/test_handler.cc
View File

@ -4,6 +4,7 @@
#include "tests/ceftests/test_handler.h"
#include <memory>
#include <sstream>
#include "include/base/cef_callback.h"
@ -150,8 +151,7 @@ class TestBrowserViewDelegate : public CefBrowserViewDelegate {
// TestHandler::CompletionState
TestHandler::CompletionState::CompletionState(int total)
: total_(total), count_(0) {
TestHandler::CompletionState::CompletionState(int total) : total_(total) {
event_ = CefWaitableEvent::CreateWaitableEvent(true, false);
}
@ -720,7 +720,7 @@ TestHandler::UIThreadHelper* TestHandler::GetUIThreadHelper() {
CHECK(!destroy_test_called_);
if (!ui_thread_helper_.get()) {
ui_thread_helper_.reset(new UIThreadHelper());
ui_thread_helper_ = std::make_unique<UIThreadHelper>();
}
return ui_thread_helper_.get();
}

2
tests/ceftests/test_handler.h
View File

@ -73,7 +73,7 @@ class TestHandler : public CefClient,
private:
int total_;
int count_;
int count_ = 0;
// Handle used to notify when the test is complete
CefRefPtr<CefWaitableEvent> event_;

2
tests/ceftests/test_server_manager.h
View File

@ -59,7 +59,7 @@ class Manager : public Runner::Delegate {
friend class ObserverRegistration;
explicit Manager(bool https_server);
~Manager();
~Manager() override;
static Manager* GetInstance(bool https_server);
static Manager* GetOrCreateInstance(bool https_server);

25
tests/ceftests/test_server_unittest.cc
View File

@ -30,7 +30,7 @@ class TestServerHandler : public CefTestServerHandler {
// The methods of this class are always executed on the server thread.
class HttpRequestHandler {
public:
virtual ~HttpRequestHandler() {}
virtual ~HttpRequestHandler() = default;
virtual bool HandleRequest(
CefRefPtr<CefTestServer> server,
CefRefPtr<CefRequest> request,
@ -48,15 +48,12 @@ class TestServerHandler : public CefTestServerHandler {
// object is destroyed.
TestServerHandler(StartCallback start_callback,
base::OnceClosure destroy_callback)
: initialized_(false),
start_callback_(std::move(start_callback)),
destroy_callback_(std::move(destroy_callback)),
expected_http_request_ct_(0),
actual_http_request_ct_(0) {
: start_callback_(std::move(start_callback)),
destroy_callback_(std::move(destroy_callback)) {
EXPECT_FALSE(destroy_callback_.is_null());
}
virtual ~TestServerHandler() {
~TestServerHandler() override {
EXPECT_UI_THREAD();
std::move(destroy_callback_).Run();
}
@ -176,7 +173,7 @@ class TestServerHandler : public CefTestServerHandler {
}
CefRefPtr<CefTestServer> server_;
bool initialized_;
bool initialized_ = false;
// After initialization only accessed on the UI thread.
StartCallback start_callback_;
@ -190,8 +187,8 @@ class TestServerHandler : public CefTestServerHandler {
std::list<std::unique_ptr<HttpRequestHandler>> http_request_handler_list_;
int expected_http_request_ct_;
int actual_http_request_ct_;
int expected_http_request_ct_ = 0;
int actual_http_request_ct_ = 0;
IMPLEMENT_REFCOUNTING(TestServerHandler);
DISALLOW_COPY_AND_ASSIGN(TestServerHandler);
@ -206,7 +203,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
// The methods of this class are always executed on the UI thread.
class RequestRunner {
public:
virtual ~RequestRunner() {}
virtual ~RequestRunner() = default;
// Create the server-side handler for the request.
virtual std::unique_ptr<TestServerHandler::HttpRequestHandler>
@ -366,7 +363,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
TestHandler::UIThreadHelper* GetUIThreadHelper() {
EXPECT_UI_THREAD();
if (!ui_thread_helper_) {
ui_thread_helper_.reset(new TestHandler::UIThreadHelper());
ui_thread_helper_ = std::make_unique<TestHandler::UIThreadHelper>();
}
return ui_thread_helper_.get();
}
@ -543,7 +540,7 @@ class StaticHttpServerRequestHandler
const HttpServerResponse& response)
: expected_request_(expected_request),
expected_request_ct_(expected_request_ct),
actual_request_ct_(0),
response_(response) {}
bool HandleRequest(CefRefPtr<CefTestServer> server,
@ -571,7 +568,7 @@ class StaticHttpServerRequestHandler
private:
CefRefPtr<CefRequest> expected_request_;
int expected_request_ct_;
int actual_request_ct_;
int actual_request_ct_ = 0;
HttpServerResponse response_;
DISALLOW_COPY_AND_ASSIGN(StaticHttpServerRequestHandler);

6
tests/ceftests/test_suite.cc
View File

@ -89,7 +89,7 @@ void RouteStdioToConsole(bool create_console_if_not_found) {
} // namespace
CefTestSuite::CefTestSuite(int argc, char** argv)
: argc_(argc), argv_(argc, argv), retval_(0) {
: argc_(argc), argv_(argc, argv) {
g_test_suite = this;
// Keep a representation of the original command-line.
@ -179,8 +179,8 @@ void CefTestSuite::RegisterTempDirectory(const CefString& directory) {
void CefTestSuite::DeleteTempDirectories() {
base::AutoLock lock_scope(temp_directories_lock_);
for (size_t i = 0U; i < temp_directories_.size(); ++i) {
CefDeleteFile(temp_directories_[i], true);
for (const auto& temp_directory : temp_directories_) {
CefDeleteFile(temp_directory, true);
}
temp_directories_.clear();
}

2
tests/ceftests/test_suite.h
View File

@ -52,7 +52,7 @@ class CefTestSuite {
CefString root_cache_path_;
int retval_;
int retval_ = 0;
};
#define CEF_SETTINGS_ACCEPT_LANGUAGE "en-GB"

16
tests/ceftests/thread_unittest.cc
View File

@ -20,8 +20,8 @@ namespace {
// Base class for creating and testing threads.
class ThreadTest : public base::RefCountedThreadSafe<ThreadTest> {
public:
ThreadTest() {}
virtual ~ThreadTest() {}
ThreadTest() = default;
virtual ~ThreadTest() = default;
// Create the test thread. Should only be called one time.
void CreateTestThread() {
@ -135,9 +135,7 @@ class SimpleThreadTest : public ThreadTest {
base::OnceClosure done_callback)
: expected_task_count_(expected_task_count),
task_callback_(std::move(task_callback)),
done_callback_(std::move(done_callback)),
got_task_count_(0U),
got_done_count_(0U) {}
done_callback_(std::move(done_callback)) {}
void RunTest() {
// Create the test thread.
@ -180,8 +178,8 @@ class SimpleThreadTest : public ThreadTest {
base::OnceClosure task_callback_;
base::OnceClosure done_callback_;
size_t got_task_count_;
size_t got_done_count_;
size_t got_task_count_ = 0U;
size_t got_done_count_ = 0U;
DISALLOW_COPY_AND_ASSIGN(SimpleThreadTest);
};
@ -309,7 +307,7 @@ const char kRenderThreadTestMsg[] = "ThreadTest.RenderThreadTest";
// Browser side.
class RenderThreadTestHandler : public TestHandler {
public:
RenderThreadTestHandler() {}
RenderThreadTestHandler() = default;
void RunTest() override {
AddResource(kRenderThreadTestHtml, "<html><body>Test</body></html>",
@ -376,7 +374,7 @@ class RenderThreadTestHandler : public TestHandler {
// Renderer side.
class RenderThreadRendererTest : public ClientAppRenderer::Delegate {
public:
RenderThreadRendererTest() {}
RenderThreadRendererTest() = default;
bool OnProcessMessageReceived(CefRefPtr<ClientAppRenderer> app,
CefRefPtr<CefBrowser> browser,

2
tests/ceftests/tracing_unittest.cc
View File

@ -223,7 +223,7 @@ class TracingTestHandler : public CefEndTracingCallback,
}
private:
~TracingTestHandler() override {}
~TracingTestHandler() override = default;
// Handle used to notify when the test is complete.
CefRefPtr<CefWaitableEvent> completion_event_;

6
tests/ceftests/track_callback.h
View File

@ -8,14 +8,16 @@
class TrackCallback {
public:
TrackCallback() : gotit_(false) {}
TrackCallback() = default;
void yes() { gotit_ = true; }
bool isSet() { return gotit_; }
void reset() { gotit_ = false; }
// Code relies on this not being marked explicit. NOLINTNEXTLINE
operator bool() const { return gotit_; }
protected:
bool gotit_;
bool gotit_ = false;
};
#endif // CEF_TESTS_CEFTESTS_TRACK_CALLBACK_H_

29
tests/ceftests/translator_unittest.cc
View File

@ -2,6 +2,8 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include <memory>
#include "include/test/cef_translator_test.h"
#include "tests/ceftests/test_handler.h"
#include "tests/gtest/include/gtest/gtest.h"
@ -155,8 +157,8 @@ TEST(TranslatorTest, StructList) {
CefRefPtr<CefTranslatorTest> obj = CefTranslatorTest::Create();
std::vector<CefPoint> list;
list.push_back(CefPoint(TEST_X_VAL, TEST_Y_VAL));
list.push_back(CefPoint(TEST_X_VAL2, TEST_Y_VAL2));
list.emplace_back(TEST_X_VAL, TEST_Y_VAL);
list.emplace_back(TEST_X_VAL2, TEST_Y_VAL2);
EXPECT_TRUE(obj->SetPointList(list));
list.clear();
@ -274,7 +276,7 @@ class TranslatorTestRefPtrClient : public CefTranslatorTestRefPtrClient {
public:
explicit TranslatorTestRefPtrClient(const int val) : val_(val) {}
virtual int GetValue() override { return val_; }
int GetValue() override { return val_; }
private:
const int val_;
@ -289,9 +291,9 @@ class TranslatorTestRefPtrClientChild
TranslatorTestRefPtrClientChild(const int val, const int other_val)
: val_(val), other_val_(other_val) {}
virtual int GetValue() override { return val_; }
int GetValue() override { return val_; }
virtual int GetOtherValue() override { return other_val_; }
int GetOtherValue() override { return other_val_; }
private:
const int val_;
@ -477,7 +479,7 @@ class TranslatorTestScopedClient : public CefTranslatorTestScopedClient {
: val_(val), got_delete_(got_delete) {}
~TranslatorTestScopedClient() override { got_delete_->yes(); }
virtual int GetValue() override { return val_; }
int GetValue() override { return val_; }
private:
const int val_;
@ -495,9 +497,9 @@ class TranslatorTestScopedClientChild
: val_(val), other_val_(other_val), got_delete_(got_delete) {}
~TranslatorTestScopedClientChild() override { got_delete_->yes(); }
virtual int GetValue() override { return val_; }
int GetValue() override { return val_; }
virtual int GetOtherValue() override { return other_val_; }
int GetOtherValue() override { return other_val_; }
private:
const int val_;
@ -524,7 +526,8 @@ TEST(TranslatorTest, OwnPtrClient) {
EXPECT_TRUE(got_delete);
got_delete.reset();
test_obj.reset(new TranslatorTestScopedClient(kTestVal, &got_delete));
test_obj =
std::make_unique<TranslatorTestScopedClient>(kTestVal, &got_delete);
CefOwnPtr<CefTranslatorTestScopedClient> handler =
obj->SetOwnPtrClientAndReturn(std::move(test_obj));
EXPECT_FALSE(test_obj.get());
@ -555,15 +558,15 @@ TEST(TranslatorTest, OwnPtrClientInherit) {
EXPECT_TRUE(got_delete);
got_delete.reset();
test_obj.reset(
new TranslatorTestScopedClientChild(kTestVal, kTestVal2, &got_delete));
test_obj = std::make_unique<TranslatorTestScopedClientChild>(
kTestVal, kTestVal2, &got_delete);
EXPECT_EQ(kTestVal, obj->SetChildOwnPtrClient(std::move(test_obj)));
EXPECT_FALSE(test_obj.get());
EXPECT_TRUE(got_delete);
got_delete.reset();
test_obj.reset(
new TranslatorTestScopedClientChild(kTestVal, kTestVal2, &got_delete));
test_obj = std::make_unique<TranslatorTestScopedClientChild>(
kTestVal, kTestVal2, &got_delete);
CefOwnPtr<CefTranslatorTestScopedClient> handler(
obj->SetChildOwnPtrClientAndReturnParent(std::move(test_obj)));
EXPECT_EQ(kTestVal, handler->GetValue());

30
tests/ceftests/urlrequest_unittest.cc
View File

@ -39,7 +39,7 @@ namespace {
// Browser-side app delegate.
class URLRequestBrowserTest : public client::ClientAppBrowser::Delegate {
public:
URLRequestBrowserTest() {}
URLRequestBrowserTest() = default;
void OnBeforeCommandLineProcessing(
CefRefPtr<client::ClientAppBrowser> app,
@ -111,7 +111,7 @@ enum ContextTestMode {
// Defines test expectations for a request.
struct RequestRunSettings {
RequestRunSettings() {}
RequestRunSettings() = default;
// Set expectations for request failure.
void SetRequestFailureExpected(cef_errorcode_t error_code) {
@ -212,13 +212,13 @@ class RequestDataMap {
TYPE_REDIRECT,
};
Entry(Type entry_type) : type(entry_type), settings(nullptr) {}
explicit Entry(Type entry_type) : type(entry_type) {}
Type type;
// Used with TYPE_NORMAL.
// |settings| is not owned by this object.
RequestRunSettings* settings;
RequestRunSettings* settings = nullptr;
// Used with TYPE_REDIRECT.
CefRefPtr<CefRequest> redirect_request;
@ -411,7 +411,7 @@ void GetTestCookie(CefRefPtr<CefRequestContext> request_context,
class Visitor : public CefCookieVisitor {
public:
explicit Visitor(GetTestCookieCallback callback)
: callback_(std::move(callback)), cookie_exists_(false) {
: callback_(std::move(callback)) {
EXPECT_FALSE(callback_.is_null());
}
~Visitor() override { std::move(callback_).Run(cookie_exists_); }
@ -431,7 +431,7 @@ void GetTestCookie(CefRefPtr<CefRequestContext> request_context,
private:
GetTestCookieCallback callback_;
bool cookie_exists_;
bool cookie_exists_ = false;
IMPLEMENT_REFCOUNTING(Visitor);
};
@ -510,8 +510,7 @@ void GetNormalResponse(const RequestRunSettings* settings,
if (settings->expect_save_cookie) {
std::stringstream ss;
ss << kRequestSaveCookieName << "="
<< "save-cookie-value";
ss << kRequestSaveCookieName << "=" << "save-cookie-value";
headerMap.insert(std::make_pair("Set-Cookie", ss.str()));
}
@ -1114,7 +1113,7 @@ class IncompleteSchemeHandler : public CefResourceHandler {
class RequestSchemeHandlerFactory : public CefSchemeHandlerFactory {
public:
RequestSchemeHandlerFactory() {}
RequestSchemeHandlerFactory() = default;
CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
@ -1231,12 +1230,9 @@ class RequestSchemeHandlerFactory : public CefSchemeHandlerFactory {
// HTTP server handler.
class RequestServerHandler : public test_server::ObserverHelper {
public:
RequestServerHandler()
: initialized_(false),
expected_http_request_ct_(-1),
actual_http_request_ct_(0) {}
RequestServerHandler() = default;
virtual ~RequestServerHandler() { RunCompleteCallback(false); }
~RequestServerHandler() override { RunCompleteCallback(false); }
// Must be called before CreateServer().
void AddSchemeHandler(RequestRunSettings* settings) {
@ -1410,7 +1406,7 @@ class RequestServerHandler : public test_server::ObserverHelper {
RequestDataMap data_map_;
bool initialized_;
bool initialized_ = false;
// Only accessed on the UI thread.
base::OnceClosure complete_callback_;
@ -1421,8 +1417,8 @@ class RequestServerHandler : public test_server::ObserverHelper {
TrackCallback got_initialized_;
TrackCallback got_shutdown_;
int expected_http_request_ct_;
int actual_http_request_ct_;
int expected_http_request_ct_ = -1;
int actual_http_request_ct_ = 0;
std::string request_log_;
};

210
tests/ceftests/v8_unittest.cc
View File

@ -106,7 +106,7 @@ enum V8TestMode {
class V8RendererTest : public ClientAppRenderer::Delegate,
public CefLoadHandler {
public:
V8RendererTest() : test_mode_(V8TEST_NONE) {}
V8RendererTest() = default;
// Run a test when the process message is received from the browser.
void RunTest() {
@ -566,7 +566,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
: destructorCalled_(destructorCalled),
releaseBufferCalled_(releaseBufferCalled) {}
~TestArrayBufferReleaseCallback() { *destructorCalled_ = true; }
~TestArrayBufferReleaseCallback() override { *destructorCalled_ = true; }
void ReleaseBuffer(void* buffer) override {
*releaseBufferCalled_ = true;
@ -620,9 +620,9 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class TestArrayBufferReleaseCallback
: public CefV8ArrayBufferReleaseCallback {
public:
TestArrayBufferReleaseCallback() {}
TestArrayBufferReleaseCallback() = default;
~TestArrayBufferReleaseCallback() {}
~TestArrayBufferReleaseCallback() override = default;
void ReleaseBuffer(void* buffer) override {}
@ -768,7 +768,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Accessor : public CefV8Accessor {
public:
Accessor() : value_(0) {}
Accessor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
@ -806,7 +806,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
}
CefRefPtr<CefV8Value> object_;
int value_;
int value_ = 0;
TrackCallback got_get_;
TrackCallback got_set_;
@ -862,7 +862,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Accessor : public CefV8Accessor {
public:
Accessor() {}
Accessor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
@ -936,7 +936,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Accessor : public CefV8Accessor {
public:
Accessor() {}
Accessor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
@ -1000,7 +1000,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Accessor : public CefV8Accessor {
public:
Accessor() {}
Accessor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
@ -1072,11 +1072,11 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Interceptor : public CefV8Interceptor {
public:
Interceptor() : value1_(0), value2_(0u), array_() {}
virtual bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
Interceptor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
EXPECT_TRUE(name.ToString() == kName1 || name.ToString() == kName2 ||
name.ToString() == kName3);
@ -1100,10 +1100,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
EXPECT_TRUE(index >= 0 && index < 3);
EXPECT_TRUE(object.get());
@ -1118,10 +1118,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
EXPECT_TRUE(name.ToString() == kName1 || name.ToString() == kName2 ||
name.ToString() == kName3);
@ -1145,10 +1145,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
EXPECT_TRUE(index >= 0 && index < 3);
EXPECT_TRUE(object.get());
@ -1164,10 +1164,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
}
CefRefPtr<CefV8Value> object_;
int value1_;
unsigned int value2_;
int value1_ = 0;
unsigned int value2_ = 0u;
CefString value3_;
int array_[3];
int array_[3] = {};
TrackCallback got_get_byname_;
TrackCallback got_get_byindex_;
@ -1274,11 +1274,11 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
typedef std::map<std::string, int> StringMap;
public:
Interceptor() {}
virtual bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
Interceptor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_byname_.yes();
StringMap::iterator it = string_map_.find(name.ToString());
if (it != string_map_.end()) {
@ -1287,10 +1287,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_byindex_.yes();
IntMap::iterator it = int_map_.find(index);
if (it != int_map_.end()) {
@ -1299,20 +1299,20 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
EXPECT_TRUE(value->IsInt());
got_set_byname_.yes();
string_map_[name.ToString()] = value->GetIntValue();
return true;
}
virtual bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
EXPECT_TRUE(value->IsInt());
got_set_byindex_.yes();
int_map_[index] = value->GetIntValue();
@ -1412,38 +1412,38 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Interceptor : public CefV8Interceptor {
public:
Interceptor() {}
virtual bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
Interceptor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_byname_.yes();
exception = kGetByNameException;
return true;
}
virtual bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_byindex_.yes();
exception = kGetByIndexException;
return true;
}
virtual bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
got_set_byname_.yes();
exception = kSetByNameException;
return true;
}
virtual bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
got_set_byindex_.yes();
exception = kSetByIndexException;
return true;
@ -1528,11 +1528,11 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Interceptor : public CefV8Interceptor {
public:
Interceptor() {}
virtual bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
Interceptor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
EXPECT_FALSE(retval.get());
got_get_byname_.yes();
if (name.ToString() == kInterceptorName) {
@ -1541,26 +1541,26 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
return true;
}
virtual bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
bool Get(int index,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_byindex_.yes();
return true;
}
virtual bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
got_set_byname_.yes();
return true;
}
virtual bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(int index,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
got_set_byindex_.yes();
return true;
}
@ -1575,20 +1575,20 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Accessor : public CefV8Accessor {
public:
Accessor() {}
virtual bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
Accessor() = default;
bool Get(const CefString& name,
const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval,
CefString& exception) override {
got_get_.yes();
retval = CefV8Value::CreateInt(kAccessorValue);
return true;
}
virtual bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
bool Set(const CefString& name,
const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value,
CefString& exception) override {
got_set_.yes();
return true;
}
@ -1953,7 +1953,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2000,7 +2000,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2071,7 +2071,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2117,7 +2117,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2160,7 +2160,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2209,7 +2209,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2259,7 +2259,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2387,7 +2387,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2485,7 +2485,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2682,7 +2682,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2772,7 +2772,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler(TrackCallback* callback) : callback_(callback) {}
explicit Handler(TrackCallback* callback) : callback_(callback) {}
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
@ -2851,7 +2851,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
// For V8TEST_CONTEXT_ENTERED
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -2903,7 +2903,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
// For V8TEST_HANDLER_CALL_ON_RELEASED_CONTEXT
class Handler : public CefV8Handler {
public:
Handler(CefRefPtr<V8RendererTest> renderer_test)
explicit Handler(CefRefPtr<V8RendererTest> renderer_test)
: renderer_test_(renderer_test) {}
bool Execute(const CefString& name,
@ -2943,7 +2943,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
// For V8TEST_HANDLER_CALL_ON_RELEASED_CONTEXT
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -3033,7 +3033,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
class Handler : public CefV8Handler {
public:
Handler() {}
Handler() = default;
bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments,
@ -3120,7 +3120,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
CefRefPtr<ClientAppRenderer> app_;
CefRefPtr<CefBrowser> browser_;
V8TestMode test_mode_;
V8TestMode test_mode_ = V8TEST_NONE;
CefRefPtr<CefV8Context> test_context_;
CefRefPtr<CefV8Value> test_object_;

6
tests/ceftests/views/button_unittest.cc
View File

@ -97,7 +97,7 @@ void VerifyMenuButtonStyle(CefRefPtr<CefMenuButton> button) {
class EmptyMenuButtonDelegate : public CefMenuButtonDelegate {
public:
EmptyMenuButtonDelegate() {}
EmptyMenuButtonDelegate() = default;
void OnMenuButtonPressed(
CefRefPtr<CefMenuButton> menu_button,
@ -166,7 +166,7 @@ const int kButtonID = 1;
class TestButtonDelegate : public CefButtonDelegate {
public:
TestButtonDelegate() {}
TestButtonDelegate() = default;
void OnButtonPressed(CefRefPtr<CefButton> button) override {
EXPECT_TRUE(button.get());
@ -326,7 +326,7 @@ void ClickMenuItem(CefRefPtr<CefMenuButton> menu_button) {
class TestMenuButtonDelegate : public CefMenuButtonDelegate,
public CefMenuModelDelegate {
public:
TestMenuButtonDelegate() {}
TestMenuButtonDelegate() = default;
void OnMenuButtonPressed(
CefRefPtr<CefMenuButton> menu_button,

8
tests/ceftests/views/panel_unittest.cc
View File

@ -17,7 +17,7 @@ namespace {
class EmptyPanelDelegate : public CefPanelDelegate {
public:
EmptyPanelDelegate() {}
EmptyPanelDelegate() = default;
private:
IMPLEMENT_REFCOUNTING(EmptyPanelDelegate);
@ -89,7 +89,7 @@ namespace {
class ParentPanelDelegate : public CefPanelDelegate {
public:
ParentPanelDelegate() {}
ParentPanelDelegate() = default;
void OnParentViewChanged(CefRefPtr<CefView> view,
bool added,
@ -138,7 +138,7 @@ class ParentPanelDelegate : public CefPanelDelegate {
class ChildPanelDelegate : public CefPanelDelegate {
public:
ChildPanelDelegate() {}
ChildPanelDelegate() = default;
void OnParentViewChanged(CefRefPtr<CefView> view,
bool added,
@ -592,7 +592,7 @@ namespace {
class SizingPanelDelegate : public CefPanelDelegate {
public:
SizingPanelDelegate() {}
SizingPanelDelegate() = default;
CefSize GetPreferredSize(CefRefPtr<CefView> view) override {
got_get_preferred_size_ = true;

4
tests/ceftests/views/scroll_view_unittest.cc
View File

@ -25,7 +25,7 @@ const int kContentPanelSize = TestWindowDelegate::kWSize + 200;
class TestScrollViewDelegate : public CefViewDelegate {
public:
TestScrollViewDelegate() {}
TestScrollViewDelegate() = default;
CefSize GetPreferredSize(CefRefPtr<CefView> view) override {
EXPECT_EQ(kScrollViewID, view->GetID());
@ -42,7 +42,7 @@ class TestScrollViewDelegate : public CefViewDelegate {
class TestPanelDelegate : public CefPanelDelegate {
public:
TestPanelDelegate() {}
TestPanelDelegate() = default;
CefSize GetPreferredSize(CefRefPtr<CefView> view) override {
EXPECT_EQ(kContentPanelID, view->GetID());

2
tests/ceftests/views/textfield_unittest.cc
View File

@ -211,7 +211,7 @@ void TranslateKey(int c, int* keycode, uint32_t* modifiers) {
class TestTextfieldDelegate : public CefTextfieldDelegate {
public:
TestTextfieldDelegate() {}
TestTextfieldDelegate() = default;
bool OnKeyEvent(CefRefPtr<CefTextfield> textfield,
const CefKeyEvent& event) override {

7
tests/ceftests/webui_unittest.cc
View File

@ -18,8 +18,7 @@ typedef std::vector<std::string> UrlList;
class WebUITestHandler : public TestHandler {
public:
explicit WebUITestHandler(const UrlList& url_list)
: url_list_(url_list), url_index_(0U), expected_error_code_(ERR_NONE) {
explicit WebUITestHandler(const UrlList& url_list) : url_list_(url_list) {
CHECK(!url_list_.empty());
}
@ -114,10 +113,10 @@ class WebUITestHandler : public TestHandler {
}
UrlList url_list_;
size_t url_index_;
size_t url_index_ = 0U;
std::string expected_url_;
int expected_error_code_;
int expected_error_code_ = ERR_NONE;
TrackCallback got_loading_state_done_;
TrackCallback got_load_error_;