From f5eef5390a6b2f641ac1040f8598c6b89de90219 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 15 Jan 2020 14:34:01 +0100 Subject: [PATCH] ceftests: Convert NULL to nullptr (see issue #2861) --- tests/ceftests/browser_info_map_unittest.cc | 82 +++++++++---------- tests/ceftests/client_app_delegates.cc | 2 +- tests/ceftests/command_line_unittest.cc | 6 +- tests/ceftests/cookie_unittest.cc | 26 +++--- tests/ceftests/dialog_unittest.cc | 2 +- .../extensions/background_unittest.cc | 6 +- .../extensions/chrome_alarms_unittest.cc | 4 +- .../extensions/chrome_storage_unittest.cc | 4 +- .../extensions/chrome_tabs_unittest.cc | 8 +- .../extensions/extension_test_handler.cc | 6 +- tests/ceftests/extensions/view_unittest.cc | 6 +- tests/ceftests/frame_unittest.cc | 27 +++--- tests/ceftests/message_router_unittest.cc | 30 +++---- tests/ceftests/navigation_unittest.cc | 20 ++--- tests/ceftests/os_rendering_unittest.cc | 11 +-- tests/ceftests/osr_accessibility_unittest.cc | 3 +- tests/ceftests/osr_display_unittest.cc | 3 +- tests/ceftests/parser_unittest.cc | 4 +- tests/ceftests/plugin_unittest.cc | 6 +- tests/ceftests/preference_unittest.cc | 16 ++-- tests/ceftests/print_unittest.cc | 2 +- tests/ceftests/request_context_unittest.cc | 20 ++--- tests/ceftests/request_handler_unittest.cc | 8 +- tests/ceftests/request_unittest.cc | 20 ++--- tests/ceftests/resource_manager_unittest.cc | 82 ++++++++++--------- .../resource_request_handler_unittest.cc | 10 +-- tests/ceftests/response_unittest.cc | 2 +- tests/ceftests/run_all_unittests.cc | 4 +- tests/ceftests/scheme_handler_unittest.cc | 4 +- tests/ceftests/server_unittest.cc | 2 +- tests/ceftests/stream_unittest.cc | 34 ++++---- tests/ceftests/string_unittest.cc | 8 +- tests/ceftests/test_handler.cc | 10 +-- tests/ceftests/test_handler.h | 10 +-- tests/ceftests/test_suite.cc | 2 +- tests/ceftests/tracing_unittest.cc | 4 +- tests/ceftests/translator_unittest.cc | 20 ++--- tests/ceftests/urlrequest_unittest.cc | 18 ++-- tests/ceftests/v8_unittest.cc | 73 +++++++++-------- tests/ceftests/xml_reader_unittest.cc | 16 ++-- tests/ceftests/zip_reader_unittest.cc | 6 +- 41 files changed, 318 insertions(+), 309 deletions(-) diff --git a/tests/ceftests/browser_info_map_unittest.cc b/tests/ceftests/browser_info_map_unittest.cc index 1f5d88b2b..ef530508e 100644 --- a/tests/ceftests/browser_info_map_unittest.cc +++ b/tests/ceftests/browser_info_map_unittest.cc @@ -176,41 +176,41 @@ TEST(BrowserInfoMapTest, FindSingleBrowser) { g_destruct_ct = 0; // obj1 not added yet. - MyObject nf1 = map.Find(kBrowserId, 1, NULL); + MyObject nf1 = map.Find(kBrowserId, 1, nullptr); EXPECT_EQ(0, nf1.member); MyObject obj1(1); map.Add(kBrowserId, 1, obj1); // obj1 should exist. - MyObject f1 = map.Find(kBrowserId, 1, NULL); + MyObject f1 = map.Find(kBrowserId, 1, nullptr); EXPECT_EQ(obj1.member, f1.member); // obj2 not added yet. - MyObject nf2 = map.Find(kBrowserId, 2, NULL); + MyObject nf2 = map.Find(kBrowserId, 2, nullptr); EXPECT_EQ(0, nf2.member); MyObject obj2(2); map.Add(kBrowserId, 2, obj2); // obj2 should exist. - MyObject f2 = map.Find(kBrowserId, 2, NULL); + MyObject f2 = map.Find(kBrowserId, 2, nullptr); EXPECT_EQ(obj2.member, f2.member); // find obj1 again. - MyObject f1b = map.Find(kBrowserId, 1, NULL); + MyObject f1b = map.Find(kBrowserId, 1, nullptr); EXPECT_EQ(obj1.member, f1b.member); // find obj2 again. - MyObject f2b = map.Find(kBrowserId, 2, NULL); + MyObject f2b = map.Find(kBrowserId, 2, nullptr); EXPECT_EQ(obj2.member, f2b.member); // doesn't exist. - MyObject nf3 = map.Find(kBrowserId, 3, NULL); + MyObject nf3 = map.Find(kBrowserId, 3, nullptr); EXPECT_EQ(0, nf3.member); - MyObject nf4 = map.Find(10, 1, NULL); + MyObject nf4 = map.Find(10, 1, nullptr); EXPECT_EQ(0, nf4.member); - MyObject nf5 = map.Find(10, 3, NULL); + MyObject nf5 = map.Find(10, 3, nullptr); EXPECT_EQ(0, nf5.member); EXPECT_EQ(0, g_destruct_ct); @@ -226,69 +226,69 @@ TEST(BrowserInfoMapTest, FindMultipleBrowsers) { g_destruct_ct = 0; // obj1 not added yet. - MyObject nf1 = map.Find(kBrowserId1, 1, NULL); + MyObject nf1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(0, nf1.member); MyObject obj1(1); map.Add(kBrowserId1, 1, obj1); // obj1 should exist. - MyObject f1 = map.Find(kBrowserId1, 1, NULL); + MyObject f1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(obj1.member, f1.member); // obj2 not added yet. - MyObject nf2 = map.Find(kBrowserId1, 2, NULL); + MyObject nf2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(0, nf2.member); MyObject obj2(2); map.Add(kBrowserId1, 2, obj2); // obj2 should exist. - MyObject f2 = map.Find(kBrowserId1, 2, NULL); + MyObject f2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(obj2.member, f2.member); // obj3 not added yet. - MyObject nf3 = map.Find(kBrowserId2, 3, NULL); + MyObject nf3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(0, nf3.member); MyObject obj3(3); map.Add(kBrowserId2, 3, obj3); // obj3 should exist. - MyObject f3 = map.Find(kBrowserId2, 3, NULL); + MyObject f3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(obj3.member, f3.member); // obj4 not added yet. - MyObject nf4 = map.Find(kBrowserId2, 4, NULL); + MyObject nf4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(0, nf4.member); MyObject obj4(4); map.Add(kBrowserId2, 4, obj4); // obj4 should exist. - MyObject f4 = map.Find(kBrowserId2, 4, NULL); + MyObject f4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(obj4.member, f4.member); // obj1-3 should exist. - MyObject f1b = map.Find(kBrowserId1, 1, NULL); + MyObject f1b = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(obj1.member, f1b.member); - MyObject f2b = map.Find(kBrowserId1, 2, NULL); + MyObject f2b = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(obj2.member, f2b.member); - MyObject f3b = map.Find(kBrowserId2, 3, NULL); + MyObject f3b = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(obj3.member, f3b.member); // wrong browser - MyObject nf5 = map.Find(kBrowserId1, 4, NULL); + MyObject nf5 = map.Find(kBrowserId1, 4, nullptr); EXPECT_EQ(0, nf5.member); - MyObject nf6 = map.Find(kBrowserId2, 1, NULL); + MyObject nf6 = map.Find(kBrowserId2, 1, nullptr); EXPECT_EQ(0, nf6.member); // deosn't exist - MyObject nf7 = map.Find(kBrowserId2, 5, NULL); + MyObject nf7 = map.Find(kBrowserId2, 5, nullptr); EXPECT_EQ(0, nf7.member); - MyObject nf8 = map.Find(8, 1, NULL); + MyObject nf8 = map.Find(8, 1, nullptr); EXPECT_EQ(0, nf8.member); - MyObject nf9 = map.Find(8, 10, NULL); + MyObject nf9 = map.Find(8, 10, nullptr); EXPECT_EQ(0, nf9.member); EXPECT_EQ(0, g_destruct_ct); @@ -370,15 +370,15 @@ TEST(BrowserInfoMapTest, FindAndRemove) { EXPECT_EQ(2U, map.size(kBrowserId2)); // visited object shouldn't exist - MyObject nf2 = map.Find(kBrowserId1, 2, NULL); + MyObject nf2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(0, nf2.member); // other objects should exist - MyObject nf1 = map.Find(kBrowserId1, 1, NULL); + MyObject nf1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(obj1.member, nf1.member); - MyObject nf3 = map.Find(kBrowserId2, 3, NULL); + MyObject nf3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(obj3.member, nf3.member); - MyObject nf4 = map.Find(kBrowserId2, 4, NULL); + MyObject nf4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(obj4.member, nf4.member); EXPECT_EQ(0, g_destruct_ct); @@ -551,15 +551,15 @@ TEST(BrowserInfoMapTest, FindAllAndRemoveOne) { EXPECT_EQ(1U, map.size(kBrowserId2)); // removed object shouldn't exist - MyObject nf3 = map.Find(kBrowserId2, 3, NULL); + MyObject nf3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(0, nf3.member); // other objects should exist - MyObject f1 = map.Find(kBrowserId1, 1, NULL); + MyObject f1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(obj1.member, f1.member); - MyObject f2 = map.Find(kBrowserId1, 2, NULL); + MyObject f2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(obj2.member, f2.member); - MyObject f4 = map.Find(kBrowserId2, 4, NULL); + MyObject f4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(obj4.member, f4.member); EXPECT_EQ(0, g_destruct_ct); @@ -605,15 +605,15 @@ TEST(BrowserInfoMapTest, FindAllAndRemoveAllByBrowser) { EXPECT_EQ(2U, map.size(kBrowserId2)); // browser1 objects shouldn't exist - MyObject nf1 = map.Find(kBrowserId1, 1, NULL); + MyObject nf1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(0, nf1.member); - MyObject nf2 = map.Find(kBrowserId1, 2, NULL); + MyObject nf2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(0, nf2.member); // browser 2 objects should exist - MyObject f3 = map.Find(kBrowserId2, 3, NULL); + MyObject f3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(obj3.member, f3.member); - MyObject f4 = map.Find(kBrowserId2, 4, NULL); + MyObject f4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(obj4.member, f4.member); EXPECT_EQ(0, g_destruct_ct); @@ -659,15 +659,15 @@ TEST(BrowserInfoMapTest, FindAllAndRemoveOneByBrowser) { EXPECT_EQ(1U, map.size(kBrowserId2)); // removed object shouldn't exist - MyObject nf4 = map.Find(kBrowserId2, 4, NULL); + MyObject nf4 = map.Find(kBrowserId2, 4, nullptr); EXPECT_EQ(0, nf4.member); // other objects should exist - MyObject f1 = map.Find(kBrowserId1, 1, NULL); + MyObject f1 = map.Find(kBrowserId1, 1, nullptr); EXPECT_EQ(obj1.member, f1.member); - MyObject f2 = map.Find(kBrowserId1, 2, NULL); + MyObject f2 = map.Find(kBrowserId1, 2, nullptr); EXPECT_EQ(obj2.member, f2.member); - MyObject f3 = map.Find(kBrowserId2, 3, NULL); + MyObject f3 = map.Find(kBrowserId2, 3, nullptr); EXPECT_EQ(obj3.member, f3.member); EXPECT_EQ(0, g_destruct_ct); diff --git a/tests/ceftests/client_app_delegates.cc b/tests/ceftests/client_app_delegates.cc index 34449df32..d2d8c2a67 100644 --- a/tests/ceftests/client_app_delegates.cc +++ b/tests/ceftests/client_app_delegates.cc @@ -112,7 +112,7 @@ void ClientAppBrowser::CreateDelegates(DelegateSet& delegates) { // static CefRefPtr ClientAppBrowser::CreatePrintHandler() { - return NULL; + return nullptr; } // static diff --git a/tests/ceftests/command_line_unittest.cc b/tests/ceftests/command_line_unittest.cc index f7c3c374e..abb71c488 100644 --- a/tests/ceftests/command_line_unittest.cc +++ b/tests/ceftests/command_line_unittest.cc @@ -82,7 +82,7 @@ void VerifyCommandLine(CefRefPtr command_line, // Test creating a command line from argc/argv or string. TEST(CommandLineTest, Init) { CefRefPtr command_line = CefCommandLine::CreateCommandLine(); - EXPECT_TRUE(command_line.get() != NULL); + EXPECT_TRUE(command_line.get() != nullptr); #if defined(OS_WIN) command_line->InitFromString( @@ -101,7 +101,7 @@ TEST(CommandLineTest, Init) { // Test creating a command line using set and append methods. TEST(CommandLineTest, Manual) { CefRefPtr command_line = CefCommandLine::CreateCommandLine(); - EXPECT_TRUE(command_line.get() != NULL); + EXPECT_TRUE(command_line.get() != nullptr); command_line->SetProgram("test.exe"); command_line->AppendSwitch("switch1"); @@ -117,7 +117,7 @@ TEST(CommandLineTest, Manual) { // Test that any prefixes included with the switches are ignored. TEST(CommandLineTest, IgnorePrefixes) { CefRefPtr command_line = CefCommandLine::CreateCommandLine(); - EXPECT_TRUE(command_line.get() != NULL); + EXPECT_TRUE(command_line.get() != nullptr); command_line->SetProgram("test.exe"); command_line->AppendSwitch("-switch1"); diff --git a/tests/ceftests/cookie_unittest.cc b/tests/ceftests/cookie_unittest.cc index 57f33e6a1..1623b50f9 100644 --- a/tests/ceftests/cookie_unittest.cc +++ b/tests/ceftests/cookie_unittest.cc @@ -583,8 +583,8 @@ class CookieTestJSHandler : public TestHandler { // Create the request context that will use an in-memory cache. CefRequestContextSettings settings; CefRefPtr request_context = - CefRequestContext::CreateContext(settings, NULL); - manager_ = request_context->GetCookieManager(NULL); + CefRequestContext::CreateContext(settings, nullptr); + manager_ = request_context->GetCookieManager(nullptr); // Create the browser. CreateBrowser(kCookieJSUrl1, request_context); @@ -838,13 +838,13 @@ class CookieTestSchemeHandler : public TestHandler { } else { // Create the request context that will use an in-memory cache. CefRequestContextSettings settings; - request_context_ = CefRequestContext::CreateContext(settings, NULL); + request_context_ = CefRequestContext::CreateContext(settings, nullptr); } // Register the scheme handler. request_context_->RegisterSchemeHandlerFactory( scheme_, "cookie-tests", new SchemeHandlerFactory(this)); - manager_ = request_context_->GetCookieManager(NULL); + manager_ = request_context_->GetCookieManager(nullptr); if (!use_global_ && (scheme_ == kCustomCookieScheme || block_cookies_)) { std::vector schemes; if (!block_cookies_) @@ -888,7 +888,7 @@ class CookieTestSchemeHandler : public TestHandler { // Unregister the scheme handler. browser->GetHost()->GetRequestContext()->RegisterSchemeHandlerFactory( - scheme_, "cookie-tests", NULL); + scheme_, "cookie-tests", nullptr); DestroyTest(); } @@ -939,8 +939,8 @@ class CookieTestSchemeHandler : public TestHandler { // Unregister the scheme handler. request_context_->RegisterSchemeHandlerFactory(scheme_, "cookie-tests", - NULL); - request_context_ = NULL; + nullptr); + request_context_ = nullptr; TestHandler::DestroyTest(); } @@ -1566,7 +1566,7 @@ class CookieAccessTestHandler : public RoutingTestHandler, } else { // Create the request context that will use an in-memory cache. CefRequestContextSettings settings; - context_ = CefRequestContext::CreateContext(settings, NULL); + context_ = CefRequestContext::CreateContext(settings, nullptr); } cookie_manager_ = context_->GetCookieManager(nullptr); @@ -1596,8 +1596,8 @@ class CookieAccessTestHandler : public RoutingTestHandler, return; } - cookie_manager_ = NULL; - context_ = NULL; + cookie_manager_ = nullptr; + context_ = nullptr; // Got both network requests. EXPECT_EQ(1, data1_.request_ct_); @@ -2032,7 +2032,7 @@ class CookieRestartTestHandler : public RoutingTestHandler, } else { // Create the request context that will use an in-memory cache. CefRequestContextSettings settings; - context_ = CefRequestContext::CreateContext(settings, NULL); + context_ = CefRequestContext::CreateContext(settings, nullptr); } cookie_manager_ = context_->GetCookieManager(nullptr); @@ -2048,8 +2048,8 @@ class CookieRestartTestHandler : public RoutingTestHandler, return; } - cookie_manager_ = NULL; - context_ = NULL; + cookie_manager_ = nullptr; + context_ = nullptr; // Get 2 network requests for each URL. EXPECT_EQ(2, data1_.request_ct_); diff --git a/tests/ceftests/dialog_unittest.cc b/tests/ceftests/dialog_unittest.cc index f6d1af711..800dc1c40 100644 --- a/tests/ceftests/dialog_unittest.cc +++ b/tests/ceftests/dialog_unittest.cc @@ -57,7 +57,7 @@ class DialogTestHandler : public TestHandler { } handler_->DestroyTest(); - handler_ = NULL; + handler_ = nullptr; } private: diff --git a/tests/ceftests/extensions/background_unittest.cc b/tests/ceftests/extensions/background_unittest.cc index 4e5bd7d22..b7961d2a3 100644 --- a/tests/ceftests/extensions/background_unittest.cc +++ b/tests/ceftests/extensions/background_unittest.cc @@ -70,7 +70,7 @@ class BackgroundLoadUnloadTestHandler : public ExtensionTestHandler { if (request_context() && !request_context_same_loader()) VerifyExtensionInContext(extension, request_context(), false, false); - extension_ = NULL; + extension_ = nullptr; // Execute asynchronously so call stacks have a chance to unwind. // Will close the browser windows. @@ -207,7 +207,7 @@ class BackgroundLoadUnloadTestHandler : public ExtensionTestHandler { } void OnDestroyTest() override { - extension_browser_ = NULL; + extension_browser_ = nullptr; EXPECT_TRUE(got_loaded_); EXPECT_TRUE(got_background_page_url_request_); @@ -280,7 +280,7 @@ class BackgroundLoadNoUnloadTestHandler // Release everything that references the request context. This should // trigger unload of the extension. CloseBrowser(extension_browser_, false); - extension_browser_ = NULL; + extension_browser_ = nullptr; ReleaseRequestContexts(); } }; diff --git a/tests/ceftests/extensions/chrome_alarms_unittest.cc b/tests/ceftests/extensions/chrome_alarms_unittest.cc index ef7aad448..a4abc86b2 100644 --- a/tests/ceftests/extensions/chrome_alarms_unittest.cc +++ b/tests/ceftests/extensions/chrome_alarms_unittest.cc @@ -52,7 +52,7 @@ class AlarmsTestHandler : public ExtensionTestHandler { EXPECT_TRUE(extension_->IsSame(extension)); EXPECT_FALSE(got_unloaded_); got_unloaded_.yes(); - extension_ = NULL; + extension_ = nullptr; // Execute asynchronously so call stacks have a chance to unwind. // Will close the browser windows. @@ -124,7 +124,7 @@ class AlarmsTestHandler : public ExtensionTestHandler { } void OnDestroyTest() override { - extension_browser_ = NULL; + extension_browser_ = nullptr; EXPECT_TRUE(got_loaded_); EXPECT_TRUE(got_url_request_); diff --git a/tests/ceftests/extensions/chrome_storage_unittest.cc b/tests/ceftests/extensions/chrome_storage_unittest.cc index 9b80de309..f71d6d8d5 100644 --- a/tests/ceftests/extensions/chrome_storage_unittest.cc +++ b/tests/ceftests/extensions/chrome_storage_unittest.cc @@ -52,7 +52,7 @@ class StorageTestHandler : public ExtensionTestHandler { EXPECT_TRUE(extension_->IsSame(extension)); EXPECT_FALSE(got_unloaded_); got_unloaded_.yes(); - extension_ = NULL; + extension_ = nullptr; // Execute asynchronously so call stacks have a chance to unwind. // Will close the browser windows. @@ -124,7 +124,7 @@ class StorageTestHandler : public ExtensionTestHandler { } void OnDestroyTest() override { - extension_browser_ = NULL; + extension_browser_ = nullptr; EXPECT_TRUE(got_loaded_); EXPECT_TRUE(got_url_request_); diff --git a/tests/ceftests/extensions/chrome_tabs_unittest.cc b/tests/ceftests/extensions/chrome_tabs_unittest.cc index 7beb37106..ae0306e00 100644 --- a/tests/ceftests/extensions/chrome_tabs_unittest.cc +++ b/tests/ceftests/extensions/chrome_tabs_unittest.cc @@ -64,7 +64,7 @@ class TabsTestHandler : public ExtensionTestHandler { EXPECT_TRUE(extension_->IsSame(extension)); EXPECT_FALSE(got_extension_unloaded_); got_extension_unloaded_.yes(); - extension_ = NULL; + extension_ = nullptr; // Execute asynchronously so call stacks have a chance to unwind. // Will close the browser windows. @@ -199,8 +199,8 @@ class TabsTestHandler : public ExtensionTestHandler { } void OnDestroyTest() override { - main_browser_ = NULL; - extension_browser_ = NULL; + main_browser_ = nullptr; + extension_browser_ = nullptr; EXPECT_TRUE(got_extension_loaded_); EXPECT_TRUE(got_main_url_request_); @@ -497,7 +497,7 @@ class CreateTestHandler : public TabsTestHandler { } void OnDestroyTest() override { - created_browser_ = NULL; + created_browser_ = nullptr; EXPECT_TRUE(got_on_before_browser_); EXPECT_TRUE(got_create_browser_url_request_); diff --git a/tests/ceftests/extensions/extension_test_handler.cc b/tests/ceftests/extensions/extension_test_handler.cc index 4f5ed80e7..b47c230de 100644 --- a/tests/ceftests/extensions/extension_test_handler.cc +++ b/tests/ceftests/extensions/extension_test_handler.cc @@ -87,7 +87,7 @@ void ExtensionTestHandler::RunTest() { CefRequestContext::CreateContext(request_context_, new Handler()); } else if (request_context_load_without_handler()) { loader_request_context_ = - CefRequestContext::CreateContext(request_context_, NULL); + CefRequestContext::CreateContext(request_context_, nullptr); } else { loader_request_context_ = request_context_; } @@ -232,6 +232,6 @@ void ExtensionTestHandler::UnloadExtension(CefRefPtr extension) { } void ExtensionTestHandler::ReleaseRequestContexts() { - request_context_ = NULL; - loader_request_context_ = NULL; + request_context_ = nullptr; + loader_request_context_ = nullptr; } diff --git a/tests/ceftests/extensions/view_unittest.cc b/tests/ceftests/extensions/view_unittest.cc index a2d1a5313..444ed1e3e 100644 --- a/tests/ceftests/extensions/view_unittest.cc +++ b/tests/ceftests/extensions/view_unittest.cc @@ -58,7 +58,7 @@ class ViewLoadUnloadTestHandler : public ExtensionTestHandler { if (request_context() && !request_context_same_loader()) VerifyExtensionInContext(extension, request_context(), false, false); - extension_ = NULL; + extension_ = nullptr; // Execute asynchronously so call stacks have a chance to unwind. // Will close the browser windows. @@ -139,7 +139,7 @@ class ViewLoadUnloadTestHandler : public ExtensionTestHandler { } void OnDestroyTest() override { - extension_browser_ = NULL; + extension_browser_ = nullptr; EXPECT_TRUE(got_loaded_); EXPECT_TRUE(got_url_request_); @@ -230,7 +230,7 @@ class ViewLoadNoUnloadTestHandler : public ViewLoadUnloadTestHandler { // Release everything that references the request context. This should // trigger unload of the extension. CloseBrowser(extension_browser_, false); - extension_browser_ = NULL; + extension_browser_ = nullptr; ReleaseRequestContexts(); } }; diff --git a/tests/ceftests/frame_unittest.cc b/tests/ceftests/frame_unittest.cc index 74beca217..1498a3291 100644 --- a/tests/ceftests/frame_unittest.cc +++ b/tests/ceftests/frame_unittest.cc @@ -293,7 +293,7 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate, CefRefPtr GetLoadHandler( CefRefPtr app) override { if (!run_test_) - return NULL; + return nullptr; return this; } @@ -337,7 +337,7 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate, CefRefPtr frame) { // End of the current expectations object. EXPECT_TRUE(expectations_->Finalize()) << "nav = " << nav_; - expectations_.reset(NULL); + expectations_.reset(nullptr); // Check if the test has failed. bool result = !TestFailed(); @@ -385,7 +385,7 @@ class FrameNavTestHandler : public TestHandler { extra_info->SetInt(kFrameNavTestCmdKey, factory_->GetID()); // Create the browser with the initial URL. - CreateBrowser(expectations_->GetMainURL(), NULL, extra_info); + CreateBrowser(expectations_->GetMainURL(), nullptr, extra_info); // Time out the test after a reasonable period of time. SetTestTimeout(15000); @@ -396,7 +396,7 @@ class FrameNavTestHandler : public TestHandler { void RunNextNav(CefRefPtr browser, CefRefPtr frame) { // End of the current expectations object. EXPECT_TRUE(expectations_->Finalize()); - expectations_.reset(NULL); + expectations_.reset(nullptr); if (!factory_->HasMoreNavigations()) { // End of the test. @@ -855,7 +855,7 @@ bool VerifySingleBrowserFrames(CefRefPtr browser, V_DECLARE(); V_EXPECT_TRUE(browser.get()); - // |frame| may be NULL for callbacks that don't specify one. + // |frame| may be nullptr for callbacks that don't specify one. if (frame.get()) { V_EXPECT_TRUE(VerifySingleBrowserFrame(browser, frame, expected_url)); } @@ -907,7 +907,7 @@ class FrameNavExpectationsBrowserTestSingleNav bool isLoading) override { V_DECLARE(); V_EXPECT_TRUE(VerifySingleBrowserFrames( - browser, NULL, isLoading ? std::string() : kFrameNavOrigin0)); + browser, nullptr, isLoading ? std::string() : kFrameNavOrigin0)); V_EXPECT_TRUE(parent::OnLoadingStateChange(browser, isLoading)); V_RETURN(); } @@ -930,7 +930,7 @@ class FrameNavExpectationsBrowserTestSingleNav bool OnAfterCreated(CefRefPtr browser) override { V_DECLARE(); - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, std::string())); + V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, nullptr, std::string())); V_EXPECT_TRUE(parent::OnAfterCreated(browser)); V_RETURN(); } @@ -974,7 +974,8 @@ class FrameNavExpectationsRendererTestSingleNav bool isLoading) override { V_DECLARE(); // A frame should always exist in the renderer process. - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, kFrameNavOrigin0)); + V_EXPECT_TRUE( + VerifySingleBrowserFrames(browser, nullptr, kFrameNavOrigin0)); V_EXPECT_TRUE(parent::OnLoadingStateChange(browser, isLoading)); V_RETURN(); } @@ -1396,13 +1397,13 @@ class FrameNavExpectationsBrowserTestMultiNav got_load_state_change_done_.yes(); V_DECLARE(); if (isLoading && nav() == 0) { - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, std::string())); + V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, nullptr, std::string())); } else if (isLoading) { // Expect the URL from the previous load. V_EXPECT_TRUE( - VerifySingleBrowserFrames(browser, NULL, GetPreviousMainURL())); + VerifySingleBrowserFrames(browser, nullptr, GetPreviousMainURL())); } else { - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, GetMainURL())); + V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, nullptr, GetMainURL())); } V_EXPECT_TRUE(parent::OnLoadingStateChange(browser, isLoading)); V_RETURN(); @@ -1427,7 +1428,7 @@ class FrameNavExpectationsBrowserTestMultiNav bool OnAfterCreated(CefRefPtr browser) override { V_DECLARE(); - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, std::string())); + V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, nullptr, std::string())); V_EXPECT_TRUE(parent::OnAfterCreated(browser)); V_RETURN(); } @@ -1504,7 +1505,7 @@ class FrameNavExpectationsRendererTestMultiNav if (!isLoading) got_load_state_change_done_.yes(); V_DECLARE(); - V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, NULL, GetMainURL())); + V_EXPECT_TRUE(VerifySingleBrowserFrames(browser, nullptr, GetMainURL())); V_EXPECT_TRUE(parent::OnLoadingStateChange(browser, isLoading)); V_RETURN(); } diff --git a/tests/ceftests/message_router_unittest.cc b/tests/ceftests/message_router_unittest.cc index a46e0a697..d90473436 100644 --- a/tests/ceftests/message_router_unittest.cc +++ b/tests/ceftests/message_router_unittest.cc @@ -76,10 +76,10 @@ class MRRenderDelegate : public ClientAppRenderer::Delegate { if (name == kJSAssertTotalCountFunc) { actual_count = - delegate_->message_router_->GetPendingCount(NULL, NULL); + delegate_->message_router_->GetPendingCount(nullptr, nullptr); } else if (name == kJSAssertBrowserCountFunc) { actual_count = - delegate_->message_router_->GetPendingCount(browser, NULL); + delegate_->message_router_->GetPendingCount(browser, nullptr); } else if (name == kJSAssertContextCountFunc) { actual_count = delegate_->message_router_->GetPendingCount(browser, context); @@ -295,7 +295,7 @@ class SingleLoadTestHandler : public MRTestHandler, AddOtherResources(); AddResource(main_url_, GetMainHTML(), "text/html"); - CreateBrowser(main_url_, NULL); + CreateBrowser(main_url_, nullptr); } void AddHandlers( @@ -498,7 +498,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler { } else { EXPECT_TRUE(false); // Not reached. } - callback_ = NULL; + callback_ = nullptr; } bool OnQuery(CefRefPtr browser, @@ -541,7 +541,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler { EXPECT_TRUE(callback_.get()); got_on_query_canceled_.yes(); - callback_ = NULL; + callback_ = nullptr; DestroyTestIfDone(); } @@ -731,7 +731,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler { callback_->Success(kSingleQueryResponse); } else { callback_->Failure(kSingleQueryErrorCode, kSingleQueryErrorMessage); - callback_ = NULL; + callback_ = nullptr; } } @@ -779,7 +779,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler { EXPECT_TRUE(callback_.get()); got_on_query_canceled_.yes(); - callback_ = NULL; + callback_ = nullptr; DestroyTestIfDone(); } @@ -1326,7 +1326,7 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler { EXPECT_TRUE(query.callback.get()) << i; // Release the callback. - query.callback = NULL; + query.callback = nullptr; // Verify that call order is correct. EXPECT_TRUE(query.got_query) << i; @@ -1883,7 +1883,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler, manager_.WillCancelByRemovingHandler(); GetRouter()->RemoveHandler(this); // All queries should be immediately canceled. - AssertQueryCount(NULL, NULL, 0); + AssertQueryCount(nullptr, nullptr, 0); } else if (cancel_type_ == CANCEL_BY_CLOSING_BROWSER) { // Change the expected behavior in the handler. SetSignalCompletionWhenAllBrowsersClose(false); @@ -1896,7 +1896,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler, EXPECT_EQ(manager, &manager_); // All queries should be canceled. - AssertQueryCount(NULL, NULL, 0); + AssertQueryCount(nullptr, nullptr, 0); DestroyTest(); @@ -2192,7 +2192,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, EXPECT_EQ(manager, &manager_); // All queries should be canceled. - AssertQueryCount(NULL, NULL, 0); + AssertQueryCount(nullptr, nullptr, 0); DestroyTest(); } @@ -2806,9 +2806,9 @@ class MultiQueryMultiBrowserTestHandler Finalize(); // Create 2 browsers simultaniously. - CreateBrowser(url1, NULL); - CreateBrowser(url2, NULL); - CreateBrowser(url3, NULL); + CreateBrowser(url1, nullptr); + CreateBrowser(url2, nullptr); + CreateBrowser(url3, nullptr); } private: @@ -2881,7 +2881,7 @@ class MultiQueryMultiNavigateTestHandler Finalize(); // 1. Load the 1st url. - CreateBrowser(url1_, NULL); + CreateBrowser(url1_, nullptr); } private: diff --git a/tests/ceftests/navigation_unittest.cc b/tests/ceftests/navigation_unittest.cc index 1a09c0c8f..3662d79d8 100644 --- a/tests/ceftests/navigation_unittest.cc +++ b/tests/ceftests/navigation_unittest.cc @@ -65,7 +65,7 @@ class HistoryNavRendererTest : public ClientAppRenderer::Delegate, CefRefPtr GetLoadHandler( CefRefPtr app) override { if (!run_test_) - return NULL; + return nullptr; return this; } @@ -287,7 +287,7 @@ class HistoryNavTestHandler : public TestHandler { extra_info->SetBool(kHistoryNavTestCmdKey, true); // Create the browser. - CreateBrowser(CefString(), NULL, extra_info); + CreateBrowser(CefString(), nullptr, extra_info); // Time out the test after a reasonable period of time. SetTestTimeout(); @@ -454,7 +454,7 @@ class HistoryNavTestHandler : public TestHandler { CefRefPtr visitor = new NavigationEntryVisitor(nav_, &got_correct_history_[nav_]); browser->GetHost()->GetNavigationEntries(visitor.get(), false); - visitor = NULL; + visitor = nullptr; std::string url1 = browser->GetMainFrame()->GetURL(); std::string url2 = frame->GetURL(); @@ -1223,14 +1223,14 @@ class OrderNavRendererTest : public ClientAppRenderer::Delegate, EXPECT_EQ(browser_id_main_, browser->GetIdentifier()); EXPECT_GT(browser->GetIdentifier(), 0); - browser_main_ = NULL; + browser_main_ = nullptr; } } CefRefPtr GetLoadHandler( CefRefPtr app) override { if (!run_test_) - return NULL; + return nullptr; return this; } @@ -1384,7 +1384,7 @@ class OrderNavTestHandler : public TestHandler { AddResource(KONav2, "Nav2", "text/html"); // Create the browser. - CreateBrowser(KONav1, NULL, GetExtraInfo()); + CreateBrowser(KONav1, nullptr, GetExtraInfo()); // Time out the test after a reasonable period of time. SetTestTimeout(); @@ -1574,7 +1574,7 @@ class OrderNavTestHandler : public TestHandler { ContinueIfReady(browser); } else { // Popup was closed. End the test. - browser_popup_ = NULL; + browser_popup_ = nullptr; DestroyTest(); } @@ -1664,7 +1664,7 @@ class LoadNavRendererTest : public ClientAppRenderer::Delegate, CefRefPtr GetLoadHandler( CefRefPtr app) override { if (!run_test_) - return NULL; + return nullptr; return this; } @@ -1756,7 +1756,7 @@ class LoadNavTestHandler : public TestHandler { extra_info->SetBool(kLoadNavTestCmdKey, true); // Create the browser. - CreateBrowser(kLoadNav1, NULL, extra_info); + CreateBrowser(kLoadNav1, nullptr, extra_info); // Time out the test after a reasonable period of time. SetTestTimeout(); @@ -3428,7 +3428,7 @@ class ExtraInfoNavTestHandler : public TestHandler { SetBrowserExtraInfo(extra_info); // Create the browser. - CreateBrowser(kExtraInfoUrl, NULL, extra_info); + CreateBrowser(kExtraInfoUrl, nullptr, extra_info); // Time out the test after a reasonable period of time. SetTestTimeout(); diff --git a/tests/ceftests/os_rendering_unittest.cc b/tests/ceftests/os_rendering_unittest.cc index 87383ecbd..3493894cb 100644 --- a/tests/ceftests/os_rendering_unittest.cc +++ b/tests/ceftests/os_rendering_unittest.cc @@ -20,7 +20,7 @@ #include #elif defined(OS_WIN) // Required for resource_util_win, which uses this as an extern -HINSTANCE hInst = ::GetModuleHandle(NULL); +HINSTANCE hInst = ::GetModuleHandle(nullptr); #endif namespace { @@ -400,7 +400,7 @@ class OSRTestHandler : public RoutingTestHandler, return new CefStreamResourceHandler("text/html", stream); } - return NULL; + return nullptr; } // CefRenderHandler methods @@ -1153,7 +1153,7 @@ class OSRTestHandler : public RoutingTestHandler, const CefCursorInfo& custom_cursor_info) override { if (test_type_ == OSR_TEST_CURSOR && started()) { EXPECT_EQ(CT_HAND, type); - EXPECT_EQ(NULL, custom_cursor_info.buffer); + EXPECT_EQ(nullptr, custom_cursor_info.buffer); DestroySucceededTestSoon(); } } @@ -1180,7 +1180,7 @@ class OSRTestHandler : public RoutingTestHandler, const CefRect& dragdiv = GetElementBounds("dragdiv"); EXPECT_TRUE(drag_data->HasImage()); CefRefPtr image = drag_data->GetImage(); - EXPECT_TRUE(image.get() != NULL); + EXPECT_TRUE(image.get() != nullptr); if (image.get()) { // Drag image height seems to always be + 1px greater than the drag rect // on Linux. Therefore allow it to be +/- 1px. @@ -1338,7 +1338,8 @@ class OSRTestHandler : public RoutingTestHandler, #else #error "Unsupported platform" #endif - CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, NULL, NULL); + CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr, + nullptr); } CefRect GetScaledRect(const CefRect& rect) const { diff --git a/tests/ceftests/osr_accessibility_unittest.cc b/tests/ceftests/osr_accessibility_unittest.cc index 0354b5a7d..815628e06 100644 --- a/tests/ceftests/osr_accessibility_unittest.cc +++ b/tests/ceftests/osr_accessibility_unittest.cc @@ -224,7 +224,8 @@ class AccessibilityTestHandler : public TestHandler, #else #error "Unsupported platform" #endif - CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, NULL, NULL); + CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr, + nullptr); } void HideEditBox(CefRefPtr browser) { diff --git a/tests/ceftests/osr_display_unittest.cc b/tests/ceftests/osr_display_unittest.cc index 8fc5269ba..0fa32ba52 100644 --- a/tests/ceftests/osr_display_unittest.cc +++ b/tests/ceftests/osr_display_unittest.cc @@ -112,7 +112,8 @@ class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler { windowInfo.SetAsWindowless(kNullWindowHandle); #endif - CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, NULL, NULL); + CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr, + nullptr); } std::string GetPageContents(const std::string& name, diff --git a/tests/ceftests/parser_unittest.cc b/tests/ceftests/parser_unittest.cc index 4cf1428f1..6ed29874f 100644 --- a/tests/ceftests/parser_unittest.cc +++ b/tests/ceftests/parser_unittest.cc @@ -351,7 +351,7 @@ TEST(ParserTest, ParseJSONDictionary) { EXPECT_EQ(123, dict->GetInt("key2")); EXPECT_EQ(VTYPE_LIST, dict->GetType("key3")); CefRefPtr key3 = dict->GetList("key3"); - EXPECT_TRUE(NULL != key3); + EXPECT_TRUE(nullptr != key3); EXPECT_TRUE(key3->IsValid()); EXPECT_EQ(3U, key3->GetSize()); EXPECT_EQ(1, key3->GetInt(0)); @@ -372,7 +372,7 @@ TEST(ParserTest, ParseJSONList) { EXPECT_TRUE(value->GetType() == VTYPE_LIST); EXPECT_FALSE(value->IsOwned()); CefRefPtr list = value->GetList(); - EXPECT_TRUE(NULL != list); + EXPECT_TRUE(nullptr != list); EXPECT_TRUE(list->IsValid()); EXPECT_EQ(3U, list->GetSize()); diff --git a/tests/ceftests/plugin_unittest.cc b/tests/ceftests/plugin_unittest.cc index 074d1ba00..276d054b3 100644 --- a/tests/ceftests/plugin_unittest.cc +++ b/tests/ceftests/plugin_unittest.cc @@ -170,7 +170,7 @@ class PluginTestHandler : public RoutingTestHandler, return false; } - void Detach() { handler_ = NULL; } + void Detach() { handler_ = nullptr; } private: PluginTestHandler* handler_; @@ -355,7 +355,7 @@ class PluginTestHandler : public RoutingTestHandler, return new CefStreamResourceHandler("application/pdf", stream); } - return NULL; + return nullptr; } void OnLoadEnd(CefRefPtr browser, @@ -509,7 +509,7 @@ class PluginTestHandler : public RoutingTestHandler, void DestroyTest() override { if (context_handler_.get()) { context_handler_->Detach(); - context_handler_ = NULL; + context_handler_ = nullptr; } if (HasContextHide()) { diff --git a/tests/ceftests/preference_unittest.cc b/tests/ceftests/preference_unittest.cc index bbd0a5b34..8c190d3d4 100644 --- a/tests/ceftests/preference_unittest.cc +++ b/tests/ceftests/preference_unittest.cc @@ -53,7 +53,7 @@ void ValidateReset(CefRefPtr context, const char* name) { EXPECT_TRUE(context->CanSetPreference(name)); CefString error; - EXPECT_TRUE(context->SetPreference(name, NULL, error)); + EXPECT_TRUE(context->SetPreference(name, nullptr, error)); EXPECT_TRUE(error.empty()); } @@ -436,7 +436,7 @@ TEST(PreferenceTest, GlobalSetGetShared) { // Sharing storage. CefRefPtr context2 = - CefRequestContext::CreateContext(context, NULL); + CefRequestContext::CreateContext(context, nullptr); EXPECT_TRUE(context2.get()); // Sharing storage. @@ -447,7 +447,7 @@ TEST(PreferenceTest, GlobalSetGetShared) { // Unassociated context. CefRequestContextSettings settings; CefRefPtr context4 = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context.get()); // Set/get the values on the first context. @@ -476,7 +476,7 @@ TEST(PreferenceTest, CustomDefaults) { CefRequestContextSettings settings; CefRefPtr context = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context.get()); ValidateDefaults(context, false, event); @@ -490,7 +490,7 @@ TEST(PreferenceTest, CustomSetGet) { CefRequestContextSettings settings; CefRefPtr context = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context.get()); ValidateSetGet(context, event); @@ -508,12 +508,12 @@ TEST(PreferenceTest, CustomSetGetShared) { CefRequestContextSettings settings; CefRefPtr context = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context.get()); // Sharing storage. CefRefPtr context2 = - CefRequestContext::CreateContext(context, NULL); + CefRequestContext::CreateContext(context, nullptr); EXPECT_TRUE(context2.get()); // Sharing storage. @@ -523,7 +523,7 @@ TEST(PreferenceTest, CustomSetGetShared) { // Unassociated context. CefRefPtr context4 = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context.get()); // Set/get the values on the first context. diff --git a/tests/ceftests/print_unittest.cc b/tests/ceftests/print_unittest.cc index 19a59075f..3a81edc47 100644 --- a/tests/ceftests/print_unittest.cc +++ b/tests/ceftests/print_unittest.cc @@ -11,7 +11,7 @@ TEST(PrintTest, SettingsSetGet) { // CefRequest CreateRequest CefRefPtr settings(CefPrintSettings::Create()); - EXPECT_TRUE(settings.get() != NULL); + EXPECT_TRUE(settings.get() != nullptr); EXPECT_TRUE(settings->IsValid()); EXPECT_FALSE(settings->IsReadOnly()); diff --git a/tests/ceftests/request_context_unittest.cc b/tests/ceftests/request_context_unittest.cc index 029d62c5f..5058ea9f5 100644 --- a/tests/ceftests/request_context_unittest.cc +++ b/tests/ceftests/request_context_unittest.cc @@ -80,7 +80,7 @@ TEST(RequestContextTest, BasicCreateNoHandler) { CefRequestContextSettings settings; CefRefPtr context1 = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context1.get()); EXPECT_FALSE(context1->IsGlobal()); EXPECT_TRUE(context1->IsSame(context1)); @@ -88,7 +88,7 @@ TEST(RequestContextTest, BasicCreateNoHandler) { EXPECT_FALSE(context1->GetHandler().get()); CefRefPtr context2 = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context2.get()); EXPECT_FALSE(context2->IsGlobal()); EXPECT_TRUE(context2->IsSame(context2)); @@ -123,7 +123,7 @@ TEST(RequestContextTest, BasicCreateSharedGlobal) { // Returns the same global context. CefRefPtr context2 = - CefRequestContext::CreateContext(context1, NULL); + CefRequestContext::CreateContext(context1, nullptr); EXPECT_TRUE(context2.get()); EXPECT_TRUE(context2->IsGlobal()); EXPECT_TRUE(context2->IsSame(context2)); @@ -142,14 +142,14 @@ TEST(RequestContextTest, BasicCreateSharedOnDisk) { CefString(&settings.cache_path) = tempdir.GetPath(); CefRefPtr context1 = - CefRequestContext::CreateContext(settings, NULL); + CefRequestContext::CreateContext(settings, nullptr); EXPECT_TRUE(context1.get()); EXPECT_FALSE(context1->IsGlobal()); EXPECT_TRUE(context1->IsSame(context1)); EXPECT_TRUE(context1->IsSharingWith(context1)); CefRefPtr context2 = - CefRequestContext::CreateContext(context1, NULL); + CefRequestContext::CreateContext(context1, nullptr); EXPECT_TRUE(context2.get()); EXPECT_FALSE(context2->IsGlobal()); EXPECT_TRUE(context2->IsSame(context2)); @@ -160,7 +160,7 @@ TEST(RequestContextTest, BasicCreateSharedOnDisk) { EXPECT_TRUE(context1->IsSharingWith(context2)); CefRefPtr context3 = - CefRequestContext::CreateContext(context2, NULL); + CefRequestContext::CreateContext(context2, nullptr); EXPECT_TRUE(context3.get()); EXPECT_FALSE(context3->IsGlobal()); EXPECT_TRUE(context3->IsSame(context3)); @@ -175,7 +175,7 @@ TEST(RequestContextTest, BasicCreateSharedOnDisk) { EXPECT_TRUE(context2->IsSharingWith(context3)); CefRefPtr context4 = - CefRequestContext::CreateContext(context1, NULL); + CefRequestContext::CreateContext(context1, nullptr); EXPECT_TRUE(context4.get()); EXPECT_FALSE(context4->IsGlobal()); EXPECT_TRUE(context4->IsSame(context4)); @@ -244,8 +244,8 @@ class PopupTestHandler : public TestHandler { CefRequestContextSettings settings; - context_ = CefRequestContext::CreateContext(settings, NULL); - cookie_manager_ = context_->GetCookieManager(NULL); + context_ = CefRequestContext::CreateContext(settings, nullptr); + cookie_manager_ = context_->GetCookieManager(nullptr); // Create browser that loads the 1st URL. CreateBrowser(url_, context_); @@ -369,7 +369,7 @@ class PopupTestHandler : public TestHandler { EXPECT_TRUE(got_load_end2_); EXPECT_TRUE(got_cookie1_); EXPECT_TRUE(got_cookie2_); - context_ = NULL; + context_ = nullptr; TestHandler::DestroyTest(); } diff --git a/tests/ceftests/request_handler_unittest.cc b/tests/ceftests/request_handler_unittest.cc index 0ea87412a..37aa65b2f 100644 --- a/tests/ceftests/request_handler_unittest.cc +++ b/tests/ceftests/request_handler_unittest.cc @@ -75,8 +75,8 @@ class NetNotifyTestHandler : public TestHandler { // Create the request context that will use an in-memory cache. CefRequestContextSettings settings; CefRefPtr request_context = - CefRequestContext::CreateContext(settings, NULL); - cookie_manager_ = request_context->GetCookieManager(NULL); + CefRequestContext::CreateContext(settings, nullptr); + cookie_manager_ = request_context->GetCookieManager(nullptr); CefRefPtr extra_info = CefDictionaryValue::Create(); extra_info->SetBool(kNetNotifyTestCmdKey, true); @@ -347,7 +347,7 @@ class NetNotifyTestHandler : public TestHandler { EXPECT_FALSE(got_before_browse2_delayed_) << " browser " << browser_id; } - cookie_manager_ = NULL; + cookie_manager_ = nullptr; TestHandler::DestroyTest(); } @@ -399,7 +399,7 @@ class NetNotifyRendererTest : public ClientAppRenderer::Delegate, CefRefPtr app) override { if (run_test_) return this; - return NULL; + return nullptr; } void OnLoadEnd(CefRefPtr browser, diff --git a/tests/ceftests/request_unittest.cc b/tests/ceftests/request_unittest.cc index bfd70e497..6368e99ef 100644 --- a/tests/ceftests/request_unittest.cc +++ b/tests/ceftests/request_unittest.cc @@ -18,7 +18,7 @@ using client::ClientAppRenderer; TEST(RequestTest, SetGet) { // CefRequest CreateRequest CefRefPtr request(CefRequest::Create()); - EXPECT_TRUE(request.get() != NULL); + EXPECT_TRUE(request.get() != nullptr); EXPECT_EQ(0U, request->GetIdentifier()); CefString url = "http://tests/run.html"; @@ -29,13 +29,13 @@ TEST(RequestTest, SetGet) { // CefPostData CreatePostData CefRefPtr postData(CefPostData::Create()); - EXPECT_TRUE(postData.get() != NULL); + EXPECT_TRUE(postData.get() != nullptr); // CefPostDataElement CreatePostDataElement CefRefPtr element1(CefPostDataElement::Create()); - EXPECT_TRUE(element1.get() != NULL); + EXPECT_TRUE(element1.get() != nullptr); CefRefPtr element2(CefPostDataElement::Create()); - EXPECT_TRUE(element2.get() != NULL); + EXPECT_TRUE(element2.get() != nullptr); // CefPostDataElement SetToFile CefString file = "c:\\path\\to\\file.ext"; @@ -106,7 +106,7 @@ TEST(RequestTest, SetGet) { EXPECT_EQ(0U, request->GetIdentifier()); request = CefRequest::Create(); - EXPECT_TRUE(request.get() != NULL); + EXPECT_TRUE(request.get() != nullptr); EXPECT_EQ(0U, request->GetIdentifier()); // CefRequest Set @@ -122,7 +122,7 @@ TEST(RequestTest, SetGet) { TEST(RequestTest, SetGetHeaderByName) { CefRefPtr request(CefRequest::Create()); - EXPECT_TRUE(request.get() != NULL); + EXPECT_TRUE(request.get() != nullptr); CefRequest::HeaderMap headers, expectedHeaders; @@ -190,7 +190,7 @@ const char kTestUrl[] = "http://tests.com/run.html"; void CreateRequest(CefRefPtr& request) { request = CefRequest::Create(); - EXPECT_TRUE(request.get() != NULL); + EXPECT_TRUE(request.get() != nullptr); request->SetURL(kTestUrl); request->SetMethod("POST"); @@ -203,10 +203,10 @@ void CreateRequest(CefRefPtr& request) { request->SetHeaderMap(headers); CefRefPtr postData(CefPostData::Create()); - EXPECT_TRUE(postData.get() != NULL); + EXPECT_TRUE(postData.get() != nullptr); CefRefPtr element1(CefPostDataElement::Create()); - EXPECT_TRUE(element1.get() != NULL); + EXPECT_TRUE(element1.get() != nullptr); char bytes[] = "Test Bytes"; element1->SetToBytes(sizeof(bytes), bytes); postData->AddElement(element1); @@ -301,7 +301,7 @@ class RequestSendRecvTestHandler : public TestHandler { EXPECT_TRUE(response->IsReadOnly()); got_resource_response_filter_.yes(); - return NULL; + return nullptr; } void OnResourceLoadComplete(CefRefPtr browser, diff --git a/tests/ceftests/resource_manager_unittest.cc b/tests/ceftests/resource_manager_unittest.cc index 4d9234e53..fff45e7fe 100644 --- a/tests/ceftests/resource_manager_unittest.cc +++ b/tests/ceftests/resource_manager_unittest.cc @@ -171,7 +171,7 @@ TEST(ResourceManagerTest, NoProviders) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Should get the message returned from GetResourceHandler when the request is // not handled. @@ -276,7 +276,7 @@ void TestUrlParsing(const char* kUrl) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -350,7 +350,7 @@ class SimpleTestProvider : public TestProvider { if (mode_ == NOT_HANDLED) return false; else if (mode_ == CONTINUE) - request->Continue(NULL); + request->Continue(nullptr); else if (mode_ == STOP) request->Stop(); else if (mode_ == REMOVE) @@ -392,11 +392,11 @@ TEST(ResourceManagerTest, ProviderNotHandled) { state.manager_->AddProvider( new SimpleTestProvider(&provider_state1, SimpleTestProvider::NOT_HANDLED, - NULL), + nullptr), 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::NOT_HANDLED, - NULL), + nullptr), 0, std::string()); CefRefPtr handler = @@ -405,7 +405,7 @@ TEST(ResourceManagerTest, ProviderNotHandled) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -439,11 +439,11 @@ TEST(ResourceManagerTest, ProviderContinue) { state.manager_->AddProvider( new SimpleTestProvider(&provider_state1, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 0, std::string()); CefRefPtr handler = @@ -452,7 +452,7 @@ TEST(ResourceManagerTest, ProviderContinue) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -485,11 +485,12 @@ TEST(ResourceManagerTest, ProviderStop) { provider_state2.destruct_callback_ = destruct_helper.callback(); state.manager_->AddProvider( - new SimpleTestProvider(&provider_state1, SimpleTestProvider::STOP, NULL), + new SimpleTestProvider(&provider_state1, SimpleTestProvider::STOP, + nullptr), 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 0, std::string()); CefRefPtr handler = @@ -498,7 +499,7 @@ TEST(ResourceManagerTest, ProviderStop) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -540,11 +541,11 @@ TEST(ResourceManagerTest, ProviderRemove) { 0, kProviderId); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 0, kProviderId); state.manager_->AddProvider( new SimpleTestProvider(&provider_state3, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 1, std::string()); CefRefPtr handler = @@ -553,7 +554,7 @@ TEST(ResourceManagerTest, ProviderRemove) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -600,11 +601,11 @@ TEST(ResourceManagerTest, ProviderRemoveAll) { 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state3, SimpleTestProvider::CONTINUE, - NULL), + nullptr), 1, std::string()); CefRefPtr handler = @@ -613,7 +614,7 @@ TEST(ResourceManagerTest, ProviderRemoveAll) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -657,12 +658,12 @@ TEST(ResourceManagerTest, ProviderDoNothing) { // DelayedDestroyTest will be executed from SimpleTestHandler::OnRequest. state.manager_->AddProvider( new SimpleTestProvider( - &provider_state1, SimpleTestProvider::DO_NOTHING, NULL, + &provider_state1, SimpleTestProvider::DO_NOTHING, nullptr, base::Bind(&ResourceManagerTestHandler::DelayedDestroyTest, handler)), 0, std::string()); state.manager_->AddProvider( new SimpleTestProvider(&provider_state2, SimpleTestProvider::DO_NOTHING, - NULL), + nullptr), 0, std::string()); handler->ExecuteTest(); @@ -670,7 +671,7 @@ TEST(ResourceManagerTest, ProviderDoNothing) { // Destroy the resource manager before the handler so that pending requests // are canceled. ResourceManagerTestHandler::GetResourceHandler will be called // after the manager is destroyed. - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -718,7 +719,7 @@ TEST(ResourceManagerTest, ContentProvider) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. WaitForIOThread(); @@ -773,7 +774,7 @@ TEST(ResourceManagerTest, DirectoryProvider) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. WaitForIOThread(); @@ -842,7 +843,7 @@ TEST(ResourceManagerTest, ArchiveProvider) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. WaitForIOThread(); @@ -949,7 +950,7 @@ TEST(ResourceManagerTest, ProviderOrder) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1036,7 +1037,7 @@ TEST(ResourceManagerTest, ManyRequests) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. WaitForIOThread(); @@ -1174,7 +1175,7 @@ TEST(ResourceManagerTest, RemoveProviderAfterContinue) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1268,7 +1269,7 @@ TEST(ResourceManagerTest, RemoveProviderBeforeContinue) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1358,7 +1359,7 @@ TEST(ResourceManagerTest, RemoveAllProvidersAfterContinue) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1446,7 +1447,7 @@ TEST(ResourceManagerTest, RemoveAllProvidersBeforeContinue) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1499,7 +1500,7 @@ class UrlFilterTestProvider : public TestProvider { request->url_filter().Run(request->request()->GetURL()); EXPECT_EQ(expected_url_after_filter_, filtered_url); - request->Continue(NULL); + request->Continue(nullptr); return true; } @@ -1562,7 +1563,7 @@ TEST(ResourceManagerTest, UrlFilter) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1615,7 +1616,7 @@ TEST(ResourceManagerTest, UrlFilterWithQuery) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1669,7 +1670,7 @@ TEST(ResourceManagerTest, UrlFilterWithFragment) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1702,7 +1703,7 @@ class MimeTypeTestProvider : public TestProvider { request->mime_type_resolver().Run(request->url()); EXPECT_EQ(expected_mime_type_, mime_type); - request->Continue(NULL); + request->Continue(nullptr); return true; } @@ -1749,7 +1750,7 @@ TEST(ResourceManagerTest, MimeTypeResolver) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1786,10 +1787,11 @@ class AddingTestProvider : public TestProvider { TestProvider::OnRequest(request); manager_->AddProvider( - new SimpleTestProvider(new_state_, SimpleTestProvider::CONTINUE, NULL), + new SimpleTestProvider(new_state_, SimpleTestProvider::CONTINUE, + nullptr), before_ ? -1 : 1, std::string()); - request->Continue(NULL); + request->Continue(nullptr); return true; } @@ -1828,7 +1830,7 @@ TEST(ResourceManagerTest, AddProviderAfter) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); @@ -1871,7 +1873,7 @@ TEST(ResourceManagerTest, AddProviderBefore) { ReleaseAndWaitForDestructor(handler); - state.manager_ = NULL; + state.manager_ = nullptr; // Wait for the manager to be deleted. destruct_helper.Wait(); diff --git a/tests/ceftests/resource_request_handler_unittest.cc b/tests/ceftests/resource_request_handler_unittest.cc index 9f21bde17..300692fd8 100644 --- a/tests/ceftests/resource_request_handler_unittest.cc +++ b/tests/ceftests/resource_request_handler_unittest.cc @@ -599,7 +599,7 @@ class BasicResponseTest : public TestHandler { get_cookie_access_filter_ct_++; - return NULL; + return nullptr; } cef_return_value_t OnBeforeResourceLoad( @@ -1597,11 +1597,11 @@ class SubresourceResponseTest : public RoutingTestHandler { if (IsMainURL(request->GetURL())) { EXPECT_TRUE(frame->IsMain()); - return NULL; + return nullptr; } else if (IsSubURL(request->GetURL())) { EXPECT_FALSE(frame->IsMain()); EXPECT_TRUE(subframe_); - return NULL; + return nullptr; } VerifyFrame(kGetCookieAccessFilter, frame); @@ -1610,7 +1610,7 @@ class SubresourceResponseTest : public RoutingTestHandler { get_cookie_access_filter_ct_++; - return NULL; + return nullptr; } cef_return_value_t OnBeforeResourceLoad( @@ -2678,7 +2678,7 @@ class RedirectResponseTest : public TestHandler { void DestroyTest() override { resource_test_->CheckExpected(); - resource_test_.reset(NULL); + resource_test_.reset(nullptr); TestHandler::DestroyTest(); } diff --git a/tests/ceftests/response_unittest.cc b/tests/ceftests/response_unittest.cc index 6d5544dcd..4ef70be8a 100644 --- a/tests/ceftests/response_unittest.cc +++ b/tests/ceftests/response_unittest.cc @@ -8,7 +8,7 @@ TEST(ResponseTest, SetGetHeaderByName) { CefRefPtr response(CefResponse::Create()); - EXPECT_TRUE(response.get() != NULL); + EXPECT_TRUE(response.get() != nullptr); CefResponse::HeaderMap headers, expectedHeaders; diff --git a/tests/ceftests/run_all_unittests.cc b/tests/ceftests/run_all_unittests.cc index 6c8d9a54d..4c46abd8a 100644 --- a/tests/ceftests/run_all_unittests.cc +++ b/tests/ceftests/run_all_unittests.cc @@ -122,12 +122,12 @@ int main(int argc, char* argv[]) { CefEnableHighDPISupport(); } - CefMainArgs main_args(::GetModuleHandle(NULL)); + CefMainArgs main_args(::GetModuleHandle(nullptr)); #else CefMainArgs main_args(argc, argv); #endif - void* windows_sandbox_info = NULL; + void* windows_sandbox_info = nullptr; #if defined(OS_WIN) && defined(CEF_USE_SANDBOX) // Manages the life span of the sandbox information object. diff --git a/tests/ceftests/scheme_handler_unittest.cc b/tests/ceftests/scheme_handler_unittest.cc index d14df44fa..ff7652000 100644 --- a/tests/ceftests/scheme_handler_unittest.cc +++ b/tests/ceftests/scheme_handler_unittest.cc @@ -80,7 +80,7 @@ class TestResults { // Current scheme handler object. Used when destroying the test from // ClientSchemeHandler::ProcessRequest(). class TestSchemeHandler; -TestSchemeHandler* g_current_handler = NULL; +TestSchemeHandler* g_current_handler = nullptr; class TestSchemeHandler : public TestHandler { public: @@ -823,7 +823,7 @@ TEST(SchemeHandlerTest, Registration) { EXPECT_TRUE(g_TestResults.got_output); // Unregister the handler. - EXPECT_TRUE(CefRegisterSchemeHandlerFactory("customstd", "test", NULL)); + EXPECT_TRUE(CefRegisterSchemeHandlerFactory("customstd", "test", nullptr)); WaitForIOThread(); g_TestResults.got_request.reset(); diff --git a/tests/ceftests/server_unittest.cc b/tests/ceftests/server_unittest.cc index fda91add1..b3f8c2aaf 100644 --- a/tests/ceftests/server_unittest.cc +++ b/tests/ceftests/server_unittest.cc @@ -880,7 +880,7 @@ class StaticHttpURLRequestClient : public CefURLRequestClient { void RunRequest() { EXPECT_UI_THREAD(); - CefURLRequest::Create(request_, this, NULL); + CefURLRequest::Create(request_, this, nullptr); } void OnRequestComplete(CefRefPtr request) override { diff --git a/tests/ceftests/stream_unittest.cc b/tests/ceftests/stream_unittest.cc index 512173bb2..89c7df9ed 100644 --- a/tests/ceftests/stream_unittest.cc +++ b/tests/ceftests/stream_unittest.cc @@ -74,25 +74,25 @@ TEST(StreamTest, ReadFile) { std::string contents = "This is my test\ncontents for the file"; // Create the file - FILE* f = NULL; + FILE* f = nullptr; #ifdef _WIN32 fopen_s(&f, fileName, "wb"); #else f = fopen(fileName, "wb"); #endif - ASSERT_TRUE(f != NULL); + ASSERT_TRUE(f != nullptr); ASSERT_EQ((size_t)1, fwrite(contents.c_str(), contents.size(), 1, f)); fclose(f); // Test the stream CefRefPtr stream( CefStreamReader::CreateForFile(fileNameStr)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); ASSERT_TRUE(stream->MayBlock()); VerifyStreamReadBehavior(stream, contents); // Release the file pointer - stream = NULL; + stream = nullptr; // Delete the file #ifdef _WIN32 @@ -109,7 +109,7 @@ TEST(StreamTest, ReadData) { CefRefPtr stream(CefStreamReader::CreateForData( static_cast(const_cast(contents.c_str())), contents.size())); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); ASSERT_FALSE(stream->MayBlock()); VerifyStreamReadBehavior(stream, contents); } @@ -122,22 +122,22 @@ TEST(StreamTest, WriteFile) { // Test the stream CefRefPtr stream( CefStreamWriter::CreateForFile(fileNameStr)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); ASSERT_TRUE(stream->MayBlock()); VerifyStreamWriteBehavior(stream, contents); // Release the file pointer - stream = NULL; + stream = nullptr; // Read the file that was written - FILE* f = NULL; + FILE* f = nullptr; char* buff = new char[contents.size()]; #ifdef _WIN32 fopen_s(&f, fileName, "rb"); #else f = fopen(fileName, "rb"); #endif - ASSERT_TRUE(f != NULL); + ASSERT_TRUE(f != nullptr); ASSERT_EQ((size_t)1, fread(buff, contents.size(), 1, f)); // Read past the end of the file @@ -163,7 +163,7 @@ class ReadHandlerTester : public CefReadHandler { public: ReadHandlerTester() : read_called_(false), - read_ptr_(NULL), + read_ptr_(nullptr), read_size_(0), read_n_(0), seek_called_(false), @@ -218,10 +218,10 @@ class ReadHandlerTester : public CefReadHandler { TEST(StreamTest, ReadHandler) { ReadHandlerTester* handler = new ReadHandlerTester(); - ASSERT_TRUE(handler != NULL); + ASSERT_TRUE(handler != nullptr); CefRefPtr stream(CefStreamReader::CreateForHandler(handler)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); ASSERT_FALSE(stream->MayBlock()); // CefReadHandler Read @@ -256,7 +256,7 @@ TEST(StreamTest, ReadHandler) { ASSERT_EQ(10, eof_res); // Delete the stream - stream = NULL; + stream = nullptr; // Verify that the handler object was deleted ASSERT_TRUE(g_ReadHandlerTesterDeleted); @@ -268,7 +268,7 @@ class WriteHandlerTester : public CefWriteHandler { public: WriteHandlerTester() : write_called_(false), - write_ptr_(NULL), + write_ptr_(nullptr), write_size_(0), write_n_(0), seek_called_(false), @@ -323,10 +323,10 @@ class WriteHandlerTester : public CefWriteHandler { TEST(StreamTest, WriteHandler) { WriteHandlerTester* handler = new WriteHandlerTester(); - ASSERT_TRUE(handler != NULL); + ASSERT_TRUE(handler != nullptr); CefRefPtr stream(CefStreamWriter::CreateForHandler(handler)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); ASSERT_FALSE(stream->MayBlock()); // CefWriteHandler Write @@ -360,7 +360,7 @@ TEST(StreamTest, WriteHandler) { ASSERT_EQ(10, flush_res); // Delete the stream - stream = NULL; + stream = nullptr; // Verify that the handler object was deleted ASSERT_TRUE(g_WriteHandlerTesterDeleted); diff --git a/tests/ceftests/string_unittest.cc b/tests/ceftests/string_unittest.cc index 85cdc2061..a2609604a 100644 --- a/tests/ceftests/string_unittest.cc +++ b/tests/ceftests/string_unittest.cc @@ -43,7 +43,7 @@ TEST(StringTest, UTF8) { // Test userfree assignment. cef_string_userfree_utf8_t uf = str2.DetachToUserFree(); - EXPECT_TRUE(uf != NULL); + EXPECT_TRUE(uf != nullptr); EXPECT_TRUE(str2.empty()); str2.AttachToUserFree(uf); EXPECT_FALSE(str2.empty()); @@ -81,7 +81,7 @@ TEST(StringTest, UTF16) { // Test userfree assignment. cef_string_userfree_utf16_t uf = str2.DetachToUserFree(); - EXPECT_TRUE(uf != NULL); + EXPECT_TRUE(uf != nullptr); EXPECT_TRUE(str2.empty()); str2.AttachToUserFree(uf); EXPECT_FALSE(str2.empty()); @@ -119,7 +119,7 @@ TEST(StringTest, Wide) { // Test userfree assignment. cef_string_userfree_wide_t uf = str2.DetachToUserFree(); - EXPECT_TRUE(uf != NULL); + EXPECT_TRUE(uf != nullptr); EXPECT_TRUE(str2.empty()); str2.AttachToUserFree(uf); EXPECT_FALSE(str2.empty()); @@ -162,7 +162,7 @@ TEST(StringTest, List) { EXPECT_EQ(list[2], "String 3"); cef_string_list_t listPtr = cef_string_list_alloc(); - EXPECT_TRUE(listPtr != NULL); + EXPECT_TRUE(listPtr != nullptr); ListType::const_iterator it = list.begin(); for (; it != list.end(); ++it) cef_string_list_append(listPtr, it->GetStruct()); diff --git a/tests/ceftests/test_handler.cc b/tests/ceftests/test_handler.cc index dde9379aa..ff064bf72 100644 --- a/tests/ceftests/test_handler.cc +++ b/tests/ceftests/test_handler.cc @@ -177,7 +177,7 @@ int TestHandler::browser_count_ = 0; TestHandler::TestHandler(CompletionState* completion_state) : first_browser_id_(0), signal_completion_when_all_browsers_close_(true), - destroy_event_(NULL), + destroy_event_(nullptr), destroy_test_expected_(true), destroy_test_called_(false) { if (completion_state) { @@ -229,7 +229,7 @@ void TestHandler::OnBeforeClose(CefRefPtr browser) { if (browser_id == first_browser_id_) { first_browser_id_ = 0; - first_browser_ = NULL; + first_browser_ = nullptr; } if (browser_map_.empty() && signal_completion_when_all_browsers_close_) { @@ -281,7 +281,7 @@ CefRefPtr TestHandler::GetResourceHandler( } } - return NULL; + return nullptr; } void TestHandler::OnRenderProcessTerminated(CefRefPtr browser, @@ -345,7 +345,7 @@ void TestHandler::DestroyTest() { } if (ui_thread_helper_.get()) - ui_thread_helper_.reset(NULL); + ui_thread_helper_.reset(nullptr); } void TestHandler::OnTestTimeout(int timeout_ms, bool treat_as_error) { @@ -387,7 +387,7 @@ void TestHandler::CreateBrowser(const CefString& url, #endif // defined(USE_AURA) { #if defined(OS_WIN) - windowInfo.SetAsPopup(NULL, "CefUnitTest"); + windowInfo.SetAsPopup(nullptr, "CefUnitTest"); windowInfo.style |= WS_VISIBLE; #endif CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, extra_info, diff --git a/tests/ceftests/test_handler.h b/tests/ceftests/test_handler.h index 96b31373d..0c7c514ca 100644 --- a/tests/ceftests/test_handler.h +++ b/tests/ceftests/test_handler.h @@ -139,7 +139,7 @@ class TestHandler : public CefClient, }; // The |completion_state| object if specified must outlive this class. - explicit TestHandler(CompletionState* completion_state = NULL); + explicit TestHandler(CompletionState* completion_state = nullptr); ~TestHandler() override; // Implement this method to set up the test. Only used in combination with a @@ -239,8 +239,8 @@ class TestHandler : public CefClient, virtual void PopulateBrowserSettings(CefBrowserSettings* settings) {} void CreateBrowser(const CefString& url, - CefRefPtr request_context = NULL, - CefRefPtr extra_info = NULL); + CefRefPtr request_context = nullptr, + CefRefPtr extra_info = nullptr); static void CloseBrowser(CefRefPtr browser, bool force_close); void AddResource(const std::string& url, @@ -321,12 +321,12 @@ void ReleaseAndWaitForDestructor(CefRefPtr& handler, int delay_ms = 2000) { CefWaitableEvent::CreateWaitableEvent(true, false); handler->SetDestroyEvent(event); T* _handler_ptr = handler.get(); - handler = NULL; + handler = nullptr; bool handler_destructed = event->TimedWait(delay_ms); EXPECT_TRUE(handler_destructed); if (!handler_destructed) { // |event| is a stack variable so clear the reference before returning. - _handler_ptr->SetDestroyEvent(NULL); + _handler_ptr->SetDestroyEvent(nullptr); } } diff --git a/tests/ceftests/test_suite.cc b/tests/ceftests/test_suite.cc index 99143014e..d96eefdba 100644 --- a/tests/ceftests/test_suite.cc +++ b/tests/ceftests/test_suite.cc @@ -182,7 +182,7 @@ void CefTestSuite::PreInitialize() { // Enable termination on heap corruption. // Ignore the result code. Supported starting with XP SP3 and Vista. - HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); + HeapSetInformation(nullptr, HeapEnableTerminationOnCorruption, nullptr, 0); #endif #if defined(OS_LINUX) && defined(USE_AURA) diff --git a/tests/ceftests/tracing_unittest.cc b/tests/ceftests/tracing_unittest.cc index 936be6eda..fee994237 100644 --- a/tests/ceftests/tracing_unittest.cc +++ b/tests/ceftests/tracing_unittest.cc @@ -87,8 +87,8 @@ class TracingTestHandler : public CefEndTracingCallback, // Verify the results. EXPECT_TRUE(!trace_data_.empty()); - EXPECT_TRUE(trace_type_ != NULL); - EXPECT_TRUE(strstr(trace_data_.c_str(), trace_type_) != NULL); + EXPECT_TRUE(trace_type_ != nullptr); + EXPECT_TRUE(strstr(trace_data_.c_str(), trace_type_) != nullptr); } void BeginTracing() { diff --git a/tests/ceftests/translator_unittest.cc b/tests/ceftests/translator_unittest.cc index 36ba9c921..b039cbc9b 100644 --- a/tests/ceftests/translator_unittest.cc +++ b/tests/ceftests/translator_unittest.cc @@ -317,7 +317,7 @@ TEST(TranslatorTest, RefPtrClient) { obj->SetRefPtrClientAndReturn(test_obj.get()); EXPECT_EQ(test_obj.get(), handler.get()); EXPECT_EQ(kTestVal, handler->GetValue()); - handler = NULL; + handler = nullptr; // Only one reference to the object should exist. EXPECT_TRUE(obj->HasOneRef()); @@ -345,7 +345,7 @@ TEST(TranslatorTest, RefPtrClientInherit) { obj->SetChildRefPtrClientAndReturnParent(test_obj); EXPECT_EQ(kTestVal, handler->GetValue()); EXPECT_EQ(test_obj.get(), handler.get()); - handler = NULL; + handler = nullptr; // Only one reference to the object should exist. EXPECT_TRUE(obj->HasOneRef()); @@ -439,7 +439,7 @@ TEST(TranslatorTest, OwnPtrLibraryInherit) { EXPECT_FALSE(test_obj.get()); EXPECT_TRUE(test_obj_parent.get()); EXPECT_EQ(kTestVal, test_obj_parent->GetValue()); - test_obj_parent.reset(NULL); + test_obj_parent.reset(nullptr); const int kTestVal3 = 100; CefOwnPtr test_obj2 = @@ -467,7 +467,7 @@ TEST(TranslatorTest, OwnPtrLibraryInherit) { EXPECT_FALSE(test_obj2.get()); EXPECT_TRUE(test_obj_parent.get()); EXPECT_EQ(kTestVal, test_obj_parent->GetValue()); - test_obj_parent.reset(NULL); + test_obj_parent.reset(nullptr); // Only one reference to the object should exist. EXPECT_TRUE(obj->HasOneRef()); @@ -535,7 +535,7 @@ TEST(TranslatorTest, OwnPtrClient) { EXPECT_TRUE(handler.get()); EXPECT_FALSE(got_delete); EXPECT_EQ(kTestVal, handler->GetValue()); - handler.reset(NULL); + handler.reset(nullptr); EXPECT_TRUE(got_delete); // Only one reference to the object should exist. @@ -574,7 +574,7 @@ TEST(TranslatorTest, OwnPtrClientInherit) { EXPECT_EQ(kTestVal, handler->GetValue()); EXPECT_FALSE(test_obj.get()); EXPECT_FALSE(got_delete); - handler.reset(NULL); + handler.reset(nullptr); EXPECT_TRUE(got_delete); // Only one reference to the object should exist. @@ -675,7 +675,7 @@ TEST(TranslatorTest, RawPtrClient) { EXPECT_EQ(kTestVal, test_obj->GetValue()); EXPECT_EQ(kTestVal, obj->SetRawPtrClient(test_obj.get())); EXPECT_FALSE(got_delete); - test_obj.reset(NULL); + test_obj.reset(nullptr); EXPECT_TRUE(got_delete); // Only one reference to the object should exist. @@ -702,7 +702,7 @@ TEST(TranslatorTest, RawPtrClientInherit) { EXPECT_EQ(kTestVal, obj->SetChildRawPtrClient(test_obj.get())); EXPECT_FALSE(got_delete); - test_obj.reset(NULL); + test_obj.reset(nullptr); EXPECT_TRUE(got_delete); // Only one reference to the object should exist. @@ -729,11 +729,11 @@ TEST(TranslatorTest, RawPtrClientList) { list.clear(); EXPECT_FALSE(got_delete1); - val1.reset(NULL); + val1.reset(nullptr); EXPECT_TRUE(got_delete1); EXPECT_FALSE(got_delete2); - val2.reset(NULL); + val2.reset(nullptr); EXPECT_TRUE(got_delete2); // Only one reference to the object should exist. diff --git a/tests/ceftests/urlrequest_unittest.cc b/tests/ceftests/urlrequest_unittest.cc index bb528b84c..5562cb7d9 100644 --- a/tests/ceftests/urlrequest_unittest.cc +++ b/tests/ceftests/urlrequest_unittest.cc @@ -379,7 +379,7 @@ void SetTestCookie(CefRefPtr request_context, CefString(&cookie.domain) = GetRequestHost(server_backend, false); CefString(&cookie.path) = "/"; cookie.has_expires = false; - EXPECT_TRUE(request_context->GetCookieManager(NULL)->SetCookie( + EXPECT_TRUE(request_context->GetCookieManager(nullptr)->SetCookie( GetRequestOrigin(server_backend), cookie, new Callback(callback))); } @@ -419,7 +419,7 @@ void GetTestCookie(CefRefPtr request_context, }; CefRefPtr cookie_manager = - request_context->GetCookieManager(NULL); + request_context->GetCookieManager(nullptr); cookie_manager->VisitUrlCookies(GetRequestOrigin(server_backend), true, new Visitor(callback)); } @@ -2718,7 +2718,7 @@ class RequestTestRunner : public base::RefCountedThreadSafe { // Remove the factory registration. request_context_->RegisterSchemeHandlerFactory( - GetRequestScheme(false), GetRequestHost(false, false), NULL); + GetRequestScheme(false), GetRequestHost(false, false), nullptr); scheme_factory_->Shutdown(complete_callback); scheme_factory_ = nullptr; } @@ -2858,8 +2858,8 @@ class RequestRendererTest : public ClientAppRenderer::Delegate { EXPECT_TRUE(return_msg->GetArgumentList()->SetBool(0, result)); browser_->GetMainFrame()->SendProcessMessage(PID_BROWSER, return_msg); - app_ = NULL; - browser_ = NULL; + app_ = nullptr; + browser_ = nullptr; } CefRefPtr app_; @@ -2955,7 +2955,7 @@ class RequestTestHandler : public TestHandler { supported_schemes.push_back(GetRequestScheme(false)); // Continue the test once supported schemes has been set. - request_context->GetCookieManager(NULL)->SetSupportedSchemes( + request_context->GetCookieManager(nullptr)->SetSupportedSchemes( supported_schemes, true, new TestCompletionCallback( base::Bind(&RequestTestHandler::PreSetupComplete, this))); @@ -2994,7 +2994,7 @@ class RequestTestHandler : public TestHandler { if (test_in_browser_) { if (test_frame_method_) { - EXPECT_TRUE(test_url_ != NULL); + EXPECT_TRUE(test_url_ != nullptr); AddResource(test_url_, "TEST", "text/html"); // Create the browser who's main frame will be the initiator for the @@ -3008,7 +3008,7 @@ class RequestTestHandler : public TestHandler { base::Bind(&RequestTestHandler::OnRunComplete, this)); } } else { - EXPECT_TRUE(test_url_ != NULL); + EXPECT_TRUE(test_url_ != nullptr); AddResource(test_url_, "TEST", "text/html"); // Create a browser to run the test in the renderer process. @@ -3572,7 +3572,7 @@ class InvalidURLTestClient : public CefURLRequestClient { request->SetMethod("GET"); request->SetURL("foo://invalidurl"); - CefURLRequest::Create(request, this, NULL); + CefURLRequest::Create(request, this, nullptr); } void CompleteOnUIThread() { diff --git a/tests/ceftests/v8_unittest.cc b/tests/ceftests/v8_unittest.cc index 9d8de88e1..f720603f0 100644 --- a/tests/ceftests/v8_unittest.cc +++ b/tests/ceftests/v8_unittest.cc @@ -640,7 +640,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, // Enter the V8 context. EXPECT_TRUE(context->Enter()); - CefRefPtr value = CefV8Value::CreateObject(NULL, NULL); + CefRefPtr value = CefV8Value::CreateObject(nullptr, nullptr); EXPECT_TRUE(value.get()); EXPECT_TRUE(value->IsObject()); @@ -676,7 +676,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, // Enter the V8 context. EXPECT_TRUE(context->Enter()); - CefRefPtr value = CefV8Value::CreateObject(NULL, NULL); + CefRefPtr value = CefV8Value::CreateObject(nullptr, nullptr); EXPECT_TRUE(value.get()); EXPECT_TRUE(value->SetUserData(new UserData(10))); @@ -751,7 +751,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Accessor* accessor = new Accessor; CefRefPtr accessorPtr(accessor); - CefRefPtr object = CefV8Value::CreateObject(accessor, NULL); + CefRefPtr object = CefV8Value::CreateObject(accessor, nullptr); EXPECT_TRUE(object.get()); accessor->object_ = object; @@ -775,7 +775,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(val->IsInt()); EXPECT_EQ(kValue, val->GetIntValue()); - accessor->object_ = NULL; + accessor->object_ = nullptr; // Exit the V8 context. EXPECT_TRUE(context->Exit()); @@ -826,7 +826,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Accessor* accessor = new Accessor; CefRefPtr accessorPtr(accessor); - CefRefPtr object = CefV8Value::CreateObject(accessor, NULL); + CefRefPtr object = CefV8Value::CreateObject(accessor, nullptr); EXPECT_TRUE(object.get()); EXPECT_FALSE(object->HasValue(kName)); @@ -898,7 +898,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Accessor* accessor = new Accessor; CefRefPtr accessorPtr(accessor); - CefRefPtr object = CefV8Value::CreateObject(accessor, NULL); + CefRefPtr object = CefV8Value::CreateObject(accessor, nullptr); EXPECT_TRUE(object.get()); EXPECT_FALSE(object->HasValue(kName)); @@ -962,7 +962,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Accessor* accessor = new Accessor; CefRefPtr accessorPtr(accessor); - CefRefPtr object = CefV8Value::CreateObject(accessor, NULL); + CefRefPtr object = CefV8Value::CreateObject(accessor, nullptr); EXPECT_TRUE(object.get()); EXPECT_FALSE(object->HasValue(kName)); @@ -1115,7 +1115,8 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Interceptor* interceptor = new Interceptor; CefRefPtr interceptorPtr(interceptor); - CefRefPtr object = CefV8Value::CreateObject(NULL, interceptor); + CefRefPtr object = + CefV8Value::CreateObject(nullptr, interceptor); EXPECT_TRUE(object.get()); interceptor->object_ = object; @@ -1184,7 +1185,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_EQ(kArray[i], val->GetIntValue()); } - interceptor->object_ = NULL; + interceptor->object_ = nullptr; // Exit the V8 context. EXPECT_TRUE(context->Exit()); @@ -1267,7 +1268,8 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Interceptor* interceptor = new Interceptor; CefRefPtr interceptorPtr(interceptor); - CefRefPtr object = CefV8Value::CreateObject(NULL, interceptor); + CefRefPtr object = + CefV8Value::CreateObject(nullptr, interceptor); EXPECT_TRUE(object.get()); EXPECT_FALSE(object->HasValue(kName)); @@ -1394,7 +1396,8 @@ class V8RendererTest : public ClientAppRenderer::Delegate, Interceptor* interceptor = new Interceptor; CefRefPtr interceptorPtr(interceptor); - CefRefPtr object = CefV8Value::CreateObject(NULL, interceptor); + CefRefPtr object = + CefV8Value::CreateObject(nullptr, interceptor); EXPECT_TRUE(object.get()); EXPECT_FALSE(object->SetValue(kName, CefV8Value::CreateInt(1), @@ -1681,7 +1684,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefRefPtr object = context->GetGlobal(); EXPECT_TRUE(object.get()); - CefRefPtr obj1 = CefV8Value::CreateObject(NULL, NULL); + CefRefPtr obj1 = CefV8Value::CreateObject(nullptr, nullptr); object->SetValue(kObjName, obj1, V8_PROPERTY_ATTRIBUTE_NONE); obj1->SetValue(kArgName, CefV8Value::CreateInt(0), @@ -1725,7 +1728,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefRefPtr object = context->GetGlobal(); EXPECT_TRUE(object.get()); - CefRefPtr obj1 = CefV8Value::CreateObject(NULL, NULL); + CefRefPtr obj1 = CefV8Value::CreateObject(nullptr, nullptr); object->SetValue(kObjName, obj1, V8_PROPERTY_ATTRIBUTE_NONE); obj1->SetValue(kArgName, CefV8Value::CreateInt(0), @@ -1962,7 +1965,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefRefPtr func = CefV8Value::CreateFunction(kFuncName, handler); EXPECT_TRUE(func.get()); - CefRefPtr obj = CefV8Value::CreateObject(NULL, NULL); + CefRefPtr obj = CefV8Value::CreateObject(nullptr, nullptr); EXPECT_TRUE(obj.get()); handler->object_ = obj; @@ -1977,7 +1980,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(retval->IsInt()); EXPECT_EQ(kRetVal, retval->GetIntValue()); - handler->object_ = NULL; + handler->object_ = nullptr; // Exit the V8 context. EXPECT_TRUE(context->Exit()); @@ -2020,7 +2023,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefV8ValueList args; - CefRefPtr retval = func->ExecuteFunction(NULL, args); + CefRefPtr retval = func->ExecuteFunction(nullptr, args); EXPECT_TRUE(handler->got_execute_); EXPECT_FALSE(retval.get()); EXPECT_TRUE(func->HasException()); @@ -2065,7 +2068,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefV8ValueList args; - CefRefPtr retval = func->ExecuteFunction(NULL, args); + CefRefPtr retval = func->ExecuteFunction(nullptr, args); EXPECT_TRUE(handler->got_execute_); EXPECT_TRUE(retval.get()); EXPECT_FALSE(func->HasException()); @@ -2115,7 +2118,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefV8ValueList args; - CefRefPtr retval = func->ExecuteFunction(NULL, args); + CefRefPtr retval = func->ExecuteFunction(nullptr, args); EXPECT_TRUE(handler->got_execute_); EXPECT_TRUE(retval.get()); EXPECT_FALSE(func->HasException()); @@ -2166,12 +2169,12 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefV8ValueList args; CefRefPtr retval = - func->ExecuteFunctionWithContext(context, NULL, args); + func->ExecuteFunctionWithContext(context, nullptr, args); EXPECT_TRUE(handler->got_execute_); EXPECT_TRUE(retval.get()); EXPECT_FALSE(func->HasException()); - handler->context_ = NULL; + handler->context_ = nullptr; DestroyTest(); } @@ -2221,7 +2224,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefV8ValueList args; args.push_back(CefV8Value::CreateString(CefString())); - CefRefPtr retval = func->ExecuteFunction(NULL, args); + CefRefPtr retval = func->ExecuteFunction(nullptr, args); EXPECT_TRUE(handler->got_execute_); EXPECT_TRUE(retval.get()); EXPECT_FALSE(func->HasException()); @@ -2489,7 +2492,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, CefRefPtr GetLoadHandler( CefRefPtr app) override { if (test_mode_ == V8TEST_NONE) - return NULL; + return nullptr; return this; } @@ -2542,7 +2545,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(entered.get()); EXPECT_TRUE(entered->IsSame(context_)); - context_ = NULL; + context_ = nullptr; retval = CefV8Value::CreateInt(21); return true; } @@ -2751,7 +2754,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, void DevToolsLoaded(CefRefPtr browser) { EXPECT_TRUE(browser->IsPopup()); - // |browser_| will be NULL if the DevTools window is opened in a separate + // |browser_| will be nullptr if the DevTools window is opened in a separate // render process. const int other_browser_id = (browser_.get() ? browser_->GetIdentifier() : -1); @@ -2779,10 +2782,10 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(return_msg->GetArgumentList()->SetBool(0, result)); browser_->GetMainFrame()->SendProcessMessage(PID_BROWSER, return_msg); - app_ = NULL; - browser_ = NULL; - test_context_ = NULL; - test_object_ = NULL; + app_ = nullptr; + browser_ = nullptr; + test_context_ = nullptr; + test_object_ = nullptr; } // Return the V8 context. @@ -2836,7 +2839,7 @@ class V8TestHandler : public TestHandler { "" "", "text/html", headers); - CreateBrowser(test_url_, NULL, extra_info); + CreateBrowser(test_url_, nullptr, extra_info); } else if (test_mode_ == V8TEST_CONTEXT_ENTERED) { AddResource(kV8ContextParentTestUrl, "" @@ -2849,7 +2852,7 @@ class V8TestHandler : public TestHandler { "" "CHILD", "text/html"); - CreateBrowser(kV8ContextParentTestUrl, NULL, extra_info); + CreateBrowser(kV8ContextParentTestUrl, nullptr, extra_info); } else if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION || test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) { AddResource(kV8OnUncaughtExceptionTestUrl, @@ -2861,7 +2864,7 @@ class V8TestHandler : public TestHandler { "\n" "\n", "text/html"); - CreateBrowser(kV8OnUncaughtExceptionTestUrl, NULL, extra_info); + CreateBrowser(kV8OnUncaughtExceptionTestUrl, nullptr, extra_info); } else if (test_mode_ == V8TEST_HANDLER_CALL_ON_RELEASED_CONTEXT) { AddResource(kV8HandlerCallOnReleasedContextUrl, "" @@ -2913,14 +2916,14 @@ class V8TestHandler : public TestHandler { "" "", "text/html"); - CreateBrowser(kV8HandlerCallOnReleasedContextUrl, NULL, extra_info); + CreateBrowser(kV8HandlerCallOnReleasedContextUrl, nullptr, extra_info); } else { - EXPECT_TRUE(test_url_ != NULL); + EXPECT_TRUE(test_url_ != nullptr); AddResource(test_url_, "" "TEST", "text/html"); - CreateBrowser(test_url_, NULL, extra_info); + CreateBrowser(test_url_, nullptr, extra_info); } // Time out the test after a reasonable period of time. @@ -3069,7 +3072,7 @@ V8_TEST_EX(ContextEvalCspBypassUnsafeEval, V8_TEST_EX(ContextEvalCspBypassSandbox, V8TEST_CONTEXT_EVAL_CSP_BYPASS_SANDBOX, kV8ContextEvalCspBypassSandbox) -V8_TEST_EX(ContextEntered, V8TEST_CONTEXT_ENTERED, NULL) +V8_TEST_EX(ContextEntered, V8TEST_CONTEXT_ENTERED, nullptr) V8_TEST_EX(Binding, V8TEST_BINDING, kV8BindingTestUrl) V8_TEST(StackTrace, V8TEST_STACK_TRACE) V8_TEST(OnUncaughtException, V8TEST_ON_UNCAUGHT_EXCEPTION) diff --git a/tests/ceftests/xml_reader_unittest.cc b/tests/ceftests/xml_reader_unittest.cc index ec79258d8..b6b765172 100644 --- a/tests/ceftests/xml_reader_unittest.cc +++ b/tests/ceftests/xml_reader_unittest.cc @@ -36,12 +36,12 @@ TEST(XmlReaderTest, Read) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(g_test_xml, sizeof(g_test_xml) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); // Create the XML reader. CefRefPtr reader(CefXmlReader::Create( stream, XML_ENCODING_NONE, "http://www.example.org/example.xml")); - ASSERT_TRUE(reader.get() != NULL); + ASSERT_TRUE(reader.get() != nullptr); // Move to the processing instruction node. ASSERT_TRUE(reader->MoveToNextNode()); @@ -503,12 +503,12 @@ TEST(XmlReaderTest, ReadError) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(test_str, sizeof(test_str) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); // Create the XML reader. CefRefPtr reader(CefXmlReader::Create( stream, XML_ENCODING_NONE, "http://www.example.org/example.xml")); - ASSERT_TRUE(reader.get() != NULL); + ASSERT_TRUE(reader.get() != nullptr); // Move to the processing instruction node and generate parser error. ASSERT_FALSE(reader->MoveToNextNode()); @@ -520,12 +520,12 @@ TEST(XmlReaderTest, ObjectLoad) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(g_test_xml, sizeof(g_test_xml) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); // Create the XML reader. CefRefPtr object(new CefXmlObject("object")); ASSERT_TRUE(object->Load(stream, XML_ENCODING_NONE, - "http://www.example.org/example.xml", NULL)); + "http://www.example.org/example.xml", nullptr)); ASSERT_FALSE(object->HasAttributes()); ASSERT_TRUE(object->HasChildren()); @@ -606,7 +606,7 @@ TEST(XmlReaderTest, ObjectLoadError) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(error_xml, sizeof(error_xml) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); CefString error_str; @@ -626,7 +626,7 @@ TEST(XmlReaderTest, ObjectLoadError) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(error_xml, sizeof(error_xml) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); CefString error_str; diff --git a/tests/ceftests/zip_reader_unittest.cc b/tests/ceftests/zip_reader_unittest.cc index 5deca0593..7181bff25 100644 --- a/tests/ceftests/zip_reader_unittest.cc +++ b/tests/ceftests/zip_reader_unittest.cc @@ -128,11 +128,11 @@ TEST(ZipReaderTest, Read) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(g_test_zip, sizeof(g_test_zip) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); // Create the Zip reader. CefRefPtr reader(CefZipReader::Create(stream)); - ASSERT_TRUE(reader.get() != NULL); + ASSERT_TRUE(reader.get() != nullptr); char buff[25]; @@ -215,7 +215,7 @@ TEST(ZipReaderTest, ReadArchive) { // Create the stream reader. CefRefPtr stream( CefStreamReader::CreateForData(g_test_zip, sizeof(g_test_zip) - 1)); - ASSERT_TRUE(stream.get() != NULL); + ASSERT_TRUE(stream.get() != nullptr); // Create the Zip archive object. CefRefPtr archive(new CefZipArchive());