Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections

src/plugin/PluginWbPassThrough.cpp

Index: src/plugin/PluginWbPassThrough.cpp
===================================================================
--- a/src/plugin/PluginWbPassThrough.cpp
+++ b/src/plugin/PluginWbPassThrough.cpp
@@ -3,9 +3,7 @@
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
-#ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
-#endif
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
@@ -159,7 +157,6 @@
   ULONG len1 = 2048;
   ULONG len2 = 2048;
 
-#ifdef SUPPORT_FILTER
   int contentType = CFilter::contentTypeAny;
 
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
@@ -177,21 +174,18 @@
     else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
     {
       boundDomain = tab->GetDocumentUrl();
-
       contentType = CFilter::contentTypeAny;
-
-#ifdef SUPPORT_FRAME_CACHING
       if ((tab != 0) && (tab->IsFrameCached(src)))
       {
         contentType = CFilter::contentTypeSubdocument;
       }
       else
-#endif // SUPPORT_FRAME_CACHING
-      contentType = GetContentType(mimeType, boundDomain, src);
+      {
+        contentType = GetContentType(mimeType, boundDomain, src);
+      }
       if (client->ShouldBlock(src, contentType, boundDomain, true))
       {
         isBlocked = true;
-
         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src);
       }
     }
@@ -285,8 +279,6 @@
       return INET_E_REDIRECT_FAILED;
     }
   }
-#endif // SUPPORT_FILTER
-
   return isBlocked ? S_FALSE : BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
 }