Implemented update checking functionality

test/UpdateCheck.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 37 matching lines @@
   {
   protected:
     AdblockPlus::AppInfo appInfo;
     TestWebRequest* webRequest;
     AdblockPlus::WebRequestPtr webRequestPtr;
     AdblockPlus::JsEnginePtr jsEngine;
     FilterEnginePtr filterEngine;
 
     bool eventCallbackCalled;
     AdblockPlus::JsValueList eventCallbackParams;
-    static bool updateCallbackCalled;
-    static std::string updateError;
+    bool updateCallbackCalled;
+    std::string updateError;
 
     void SetUp()
     {
       webRequest = new TestWebRequest();
       webRequestPtr.reset(webRequest);
 
       eventCallbackCalled = false;
       updateCallbackCalled = false;
       Reset();
     }
 
     void Reset()
     {
       jsEngine = AdblockPlus::JsEngine::New(appInfo);
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
       jsEngine->SetWebRequest(webRequestPtr);
       jsEngine->SetEventCallback("updateAvailable",
           std::tr1::bind(&UpdateCheckTest::EventCallback, this, std::tr1::placeholders::_1));
 
       filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine));
     }
 
     void ForceUpdateCheck()
     {
-      filterEngine->ForceUpdateCheck(&UpdateCheckTest::UpdateCallback);
+      filterEngine->ForceUpdateCheck(
+          std::tr1::bind(&UpdateCheckTest::UpdateCallback, this, std::tr1::placeholders::_1));
     }
 
     void EventCallback(AdblockPlus::JsValueList& params)
     {
       eventCallbackCalled = true;
       eventCallbackParams = params;
     }
 
-    // This really shouldn't be static but I couldn't make std::bind() work for it.
-    static void UpdateCallback(const std::string& error)
+    void UpdateCallback(const std::string& error)
     {
       updateCallbackCalled = true;
       updateError = error;
     }
   };
-
-  bool UpdateCheckTest::updateCallbackCalled = false;
-  std::string UpdateCheckTest::updateError;
 }
 
 TEST_F(UpdateCheckTest, RequestFailure)
 {
   webRequest->response.status = AdblockPlus::WebRequest::NS_ERROR_FAILURE;
 
   appInfo.name = "1";
   appInfo.id = "2";
   appInfo.version = "3";
   appInfo.platform = "4";
@@ skipping 131 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }