Issue #1234 - remove CString from declarations representing domains.

src/plugin/PluginTabBase.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClient.h"
 #include "PluginSettings.h"
 #ifdef SUPPORT_CONFIG
 #include "PluginConfig.h"
 #endif
 #include "PluginTab.h"
 #include "PluginDomTraverser.h"
 #include "PluginClass.h"
@@ skipping 68 matching lines @@
 
 void CPluginTabBase::OnUpdate()
 {
   m_isActivated = true;
 }
 
 namespace
 {
   void FilterLoader(CPluginTabBase* tabBase)
   {
-    tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain().GetString()));
+    tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain()));
     SetEvent(tabBase->m_filter->hideFiltersLoadedEvent);
   }
 }
 
 void CPluginTabBase::OnNavigate(const CString& url)
 {
   SetDocumentUrl(url);
 
 
 #ifdef SUPPORT_FRAME_CACHING
@@ skipping 137 matching lines @@
         docHostUIHandler->UpdateUI();
       }
     }
 
     pDoc.Release();
     pDocDispatch.Release();
   }
 #endif
 }
 
-CString CPluginTabBase::GetDocumentDomain()
+std::wstring CPluginTabBase::GetDocumentDomain()
 {
-  CString domain;
+  std::wstring domain;
 
   m_criticalSection.Lock();
   {
     domain = m_documentDomain;
   }
   m_criticalSection.Unlock();
 
   return domain;
 }
 
 void CPluginTabBase::SetDocumentUrl(const CString& url)
 {
   m_criticalSection.Lock();
   {
     m_documentUrl = url;
-    m_documentDomain = CString(CAdblockPlusClient::GetInstance()->GetHostFromUrl(url.GetString()).c_str());
+    m_documentDomain = CAdblockPlusClient::GetInstance()->GetHostFromUrl(to_wstring(url));
   }
   m_criticalSection.Unlock();
 }
 
 CString CPluginTabBase::GetDocumentUrl()
 {
   CString url;
 
   m_criticalSection.Lock();
   {
@@ skipping 26 matching lines @@
 
 void CPluginTabBase::CacheFrame(const CString& url)
 {
   m_criticalSectionCache.Lock();
   {
     m_cacheFrames.insert(url);
   }
   m_criticalSectionCache.Unlock();
 }
 
-void CPluginTabBase::ClearFrameCache(const CString& domain)
+void CPluginTabBase::ClearFrameCache(const std::wstring& domain)
 {
   m_criticalSectionCache.Lock();
   {
-    if (domain.IsEmpty() || domain != m_cacheDomain)
+    if (domain.empty() || domain != m_cacheDomain)
     {
       m_cacheFrames.clear();
       m_cacheDomain = domain;
     }
   }
   m_criticalSectionCache.Unlock();
 }
 
 #endif // SUPPORT_FRAME_CACHING
 
@@ skipping 59 matching lines @@
           CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
         }
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 }