Issue #4711 - Rewrite legacy thread facilities

test/UpdateCheck.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 95 matching lines @@
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = false;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 
   std::string expectedUrl(filterEngine->GetPref("update_url_release")->AsString());
   std::string platform = jsEngine->Evaluate("require('info').platform")->AsString();
   std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->AsString();
 
   FindAndReplace(expectedUrl, "%NAME%", appInfo.name);
@@ skipping 16 matching lines @@
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   ASSERT_EQ("https://foo.bar/", eventCallbackParams[0]->AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 
   std::string expectedUrl(filterEngine->GetPref("update_url_devbuild")->AsString());
   std::string platform = jsEngine->Evaluate("require('info').platform")->AsString();
   std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->AsString();
@@ skipping 18 matching lines @@
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   ASSERT_EQ("https://foo.bar/", eventCallbackParams[0]->AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongApplication)
 {
   webRequest->response.status = AdblockPlus::WebRequest::NS_OK;
   webRequest->response.responseStatus = 200;
   webRequest->response.responseText = "{\"1/3\": {\"version\":\"3.1\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongVersion)
 {
   webRequest->response.status = AdblockPlus::WebRequest::NS_OK;
   webRequest->response.responseStatus = 200;
   webRequest->response.responseText = "{\"1\": {\"version\":\"3\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongURL)
 {
   webRequest->response.status = AdblockPlus::WebRequest::NS_OK;
   webRequest->response.responseStatus = 200;
   webRequest->response.responseText = "{\"1\": {\"version\":\"3.1\",\"url\":\"http://insecure/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
-  AdblockPlus::Sleep(100);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }