Issue #1234 + Clean up - CPluginTab (dead code, nullptr defect fix, etc.)

src/plugin/PluginTabBase.h

Index: src/plugin/PluginTabBase.h
===================================================================
--- a/src/plugin/PluginTabBase.h
+++ b/src/plugin/PluginTabBase.h
@@ -15,82 +15,55 @@
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _PLUGIN_TAB_BASE_H_
-#define _PLUGIN_TAB_BASE_H_
-
-class CPluginDomTraverser;
-
-#include "PluginUserSettings.h"
-#include "PluginFilter.h"
-#include "../shared/CriticalSection.h"
-#include <thread>
-#include <atomic>
-
-class CPluginClass;
-
-
-class CPluginTabBase
-{
-
-  friend class CPluginClass;
-
-protected:
-
-  CComAutoCriticalSection m_criticalSection;
-  CriticalSection m_csInject;
-
-  std::wstring m_documentDomain;
-  std::wstring m_documentUrl;
-  CPluginUserSettings m_pluginUserSettings;
-public:
-  CPluginClass* m_plugin;
-protected:
-  bool m_isActivated;
-
-  std::thread m_thread;
-  std::atomic<bool> m_continueThreadRunning;
-  CPluginDomTraverser* m_traverser;
-public:
-  std::auto_ptr<CPluginFilter> m_filter;
-private:
-  void ThreadProc();
-  CComAutoCriticalSection m_criticalSectionCache;
-  std::set<std::wstring> m_cacheFrames;
-  std::wstring m_cacheDomain;
-  void SetDocumentUrl(const std::wstring& url);
-  void InjectABP(IWebBrowser2* browser);
-public:
-
-  CPluginTabBase(CPluginClass* plugin);
-  ~CPluginTabBase();
-
-  std::wstring GetDocumentDomain();
-  std::wstring GetDocumentUrl();
-  virtual void OnActivate();
-  virtual void OnUpdate();
-  virtual void OnNavigate(const std::wstring& url);
-  virtual void OnDownloadComplete(IWebBrowser2* browser);
-  virtual void OnDocumentComplete(IWebBrowser2* browser, const std::wstring& url, bool isDocumentBrowser);
-  static DWORD WINAPI TabThreadProc(LPVOID pParam);
-  void CacheFrame(const std::wstring& url);
-  bool IsFrameCached(const std::wstring& url);
-  void ClearFrameCache(const std::wstring& domain=L"");
-
-};
-
-/**
- * Temporary class used during refactoring.
- * This is the definition previously in AdblockPlusTab.h
- * Defining this class during refactoring alleviates the need to rename CPluginTabBase in the first change set.
- */
-class CPluginTab : public CPluginTabBase
+#ifndef _PLUGIN_TAB_BASE_H_
+#define _PLUGIN_TAB_BASE_H_
+
+class CPluginDomTraverser;
+
+#include "PluginUserSettings.h"
+#include "PluginFilter.h"
+#include "../shared/CriticalSection.h"
+#include <thread>
+#include <atomic>
+
+class CPluginTab
 {
+  CComAutoCriticalSection m_criticalSection;
+  CriticalSection m_csInject;
 
+  std::wstring m_documentDomain;
+  std::wstring m_documentUrl;
+  CPluginUserSettings m_pluginUserSettings;
+  bool m_isActivated;
+
+  std::thread m_thread;
+  std::atomic<bool> m_continueThreadRunning;
+  CPluginDomTraverser* m_traverser;
 public:
-  CPluginTab(CPluginClass* plugin) : CPluginTabBase(plugin) {};
-  ~CPluginTab() {};
+  CPluginFilter m_filter;
+private:
+  void ThreadProc();
+  CComAutoCriticalSection m_criticalSectionCache;
+  std::set<std::wstring> m_cacheFrames;
+  std::wstring m_cacheDomain;
+  void InjectABP(IWebBrowser2* browser);
+public:
+
+  CPluginTab();
+  ~CPluginTab();
+
+  std::wstring GetDocumentDomain();
+  void SetDocumentUrl(const std::wstring& url);
+  std::wstring GetDocumentUrl();
+  virtual void OnActivate();
+  virtual void OnUpdate();
+  virtual void OnNavigate(const std::wstring& url);
+  virtual void OnDownloadComplete(IWebBrowser2* browser);
+  virtual void OnDocumentComplete(IWebBrowser2* browser, const std::wstring& url, bool isDocumentBrowser);
+  static DWORD WINAPI TabThreadProc(LPVOID pParam);
+  void CacheFrame(const std::wstring& url);
+  bool IsFrameCached(const std::wstring& url);
+  void ClearFrameCache(const std::wstring& domain=L"");
 };
 
-
-
-#endif // _PLUGIN_TAB_BASE_H_
+#endif // _PLUGIN_TAB_BASE_H_