Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/plugin/PluginWbPassThrough.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
 #include <cstdint>
+#include <AdblockPlus/FilterEngine.h>
 #include "ProtocolCF.h"
 #include "ProtocolImpl.h"
 #define IE_MAX_URL_LENGTH 2048
 
 class WBPassthruSink :
         public PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComMultiThreadModel>,
         public IHttpNegotiate
 {
         typedef PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComMultiThreadModel> BaseClass;
 
 public:
         WBPassthruSink();
 
         uint64_t m_currentPositionOfSentPage;
         CComPtr<IInternetProtocol> m_pTargetProtocol;
-        int m_contentType;
+        AdblockPlus::FilterEngine::ContentType m_contentType;

[Eric, 2015/02/02 06:58:27]

This variable is only used as a local variable inside
WBPassthruSink::BeginningTransaction(). It really doesn't belong as a member
variable.

It can be eliminated and declared 'auto' where it's used. There's also a
constructor initialization for it that needs to be removed.

         std::wstring m_boundDomain;

[Eric, 2015/02/02 06:58:27]

If you want to, this variable is also a local variable needlessly declared as a
member variable, and in the same function as m_contentType.

[sergei, 2015/02/04 12:51:43]

Right, they were introduced as members when we were using them in Start and in
BeginningTransaction. Now there is no necessity for that.
I've created a ticket #1937.

         bool m_isCustomResponse;
 
-        int GetContentTypeFromMimeType(const CString& mimeType);
-  int GetContentTypeFromURL(const std::wstring& src);
-  int GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src);
+        AdblockPlus::FilterEngine::ContentType GetContentTypeFromMimeType(const CString& mimeType);
+        AdblockPlus::FilterEngine::ContentType GetContentTypeFromURL(const std::wstring& src);
+        AdblockPlus::FilterEngine::ContentType GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src);

[Eric, 2015/02/02 06:58:27]

These functions are only used (ultimately) by
WBPassthruSink::BeginningTransaction(). (The first two are each called once by
the third). In addition, they don't reference any class members, neither
ordinary nor static class members.

Thus these three declarations can be removed entirely from this class definition
and converted to plain functions where they're currently defined.

They could be also put in an anonymous namespace, but there's no pressing need
for that, especially in the present change set.

[sergei, 2015/02/04 12:51:43]

I completely agree with it, it's also in the ticket #1937.

         bool IsFlashRequest(const wchar_t* const* additionalHeaders);
 public:
         BEGIN_COM_MAP(WBPassthruSink)
                 COM_INTERFACE_ENTRY(IHttpNegotiate)
                 COM_INTERFACE_ENTRY_CHAIN(BaseClass)
         END_COM_MAP()
 
         BEGIN_SERVICE_MAP(WBPassthruSink)
                 SERVICE_ENTRY(IID_IHttpNegotiate)
         END_SERVICE_MAP()
@@ skipping 38 matching lines @@
   WBPassthru();
   // IInternetProtocolRoot
   STDMETHODIMP Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
     IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) override;
 
   //IInternetProtocol
   STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead) override;
 
   bool m_shouldSupplyCustomContent;
 };