Issue 5002 - Fix potential concurrency issues in WebRequest tests.

test/WebRequest.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 65 matching lines @@
     mutable std::map<std::string, std::set<std::string>> requestHeaderNames;
   };
 
   template<class T>
   class WebRequestTest : public BaseJsTest
   {
   protected:
     void SetUp()
     {
       BaseJsTest::SetUp();
-      webRequest = std::shared_ptr<T>(new T());

[sergei, 2017/04/19 14:44:47]

std::make_shared are usually preferable, though here it does not matter.

[hub, 2017/04/19 14:55:06]

let's make it right.

+      webRequest = std::make_shared<T>();
       jsEngine->SetWebRequest(webRequest);
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem()));
     }
 
     std::shared_ptr<T> webRequest;
   };
 
   typedef WebRequestTest<MockWebRequest> MockWebRequestTest;
   typedef WebRequestTest<AdblockPlus::DefaultWebRequest> DefaultWebRequestTest;
   typedef WebRequestTest<MockWebRequest> XMLHttpRequestTest;
@@ skipping 147 matching lines @@
   typedef std::shared_ptr<CatchLogSystem> CatchLogSystemPtr;
 }
 
 TEST_F(XMLHttpRequestTest, RequestHeaderValidation)
 {
   auto catchLogSystem = CatchLogSystemPtr(new CatchLogSystem());
   jsEngine->SetLogSystem(catchLogSystem);
 
   auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
 
-  ASSERT_TRUE(webRequest);

[sergei, 2017/04/19 14:44:47]

I'm not sure whether we need it.

[hub, 2017/04/19 14:55:06]

I'm probably being paranoid. Even before I'm sure the test was not needed.
Removing.

-
   const std::string msg = "Attempt to set a forbidden header was denied: ";
 
   // The test will check that console.warn has been called when the
   // header is rejected. While this is an implementation detail, we
   // have no other way to check this
 
   // test 'Accept-Encoding' is rejected
   catchLogSystem->clear();
   std::string url = ResetTestXHR(jsEngine);
   jsEngine->Evaluate("\
@@ skipping 76 matching lines @@
   EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLevel);
   EXPECT_EQ("", catchLogSystem->lastMessage);
   WaitForVariable("result", jsEngine);
   {
     auto headersRequest = webRequest->headersForRequest(url);
     EXPECT_TRUE(headersRequest.first);
     const auto& headers = headersRequest.second;
     EXPECT_FALSE(headers.cend() == headers.find("Security"));
   }
 }