Rename CefBase to CefBaseRefCounted (issue #2090)

libcef_dll/ctocpp/views/box_layout_ctocpp.cc

@@ -100,16 +100,17 @@ bool CefBoxLayoutCToCpp::IsValid() {
 CefBoxLayoutCToCpp::CefBoxLayoutCToCpp() {
 }
 
-template<> cef_box_layout_t* CefCToCpp<CefBoxLayoutCToCpp, CefBoxLayout,
-    cef_box_layout_t>::UnwrapDerived(CefWrapperType type, CefBoxLayout* c) {
+template<> cef_box_layout_t* CefCToCppRefCounted<CefBoxLayoutCToCpp,
+    CefBoxLayout, cef_box_layout_t>::UnwrapDerived(CefWrapperType type,
+    CefBoxLayout* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefBoxLayoutCToCpp, CefBoxLayout,
-    cef_box_layout_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefBoxLayoutCToCpp,
+    CefBoxLayout, cef_box_layout_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefBoxLayoutCToCpp, CefBoxLayout,
+template<> CefWrapperType CefCToCppRefCounted<CefBoxLayoutCToCpp, CefBoxLayout,
     cef_box_layout_t>::kWrapperType = WT_BOX_LAYOUT;

libcef_dll/ctocpp/views/box_layout_ctocpp.h

@@ -22,12 +22,13 @@
 #include "include/capi/views/cef_box_layout_capi.h"
 #include "include/views/cef_view.h"
 #include "include/capi/views/cef_view_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefBoxLayoutCToCpp
-    : public CefCToCpp<CefBoxLayoutCToCpp, CefBoxLayout, cef_box_layout_t> {
+    : public CefCToCppRefCounted<CefBoxLayoutCToCpp, CefBoxLayout,
+        cef_box_layout_t> {
  public:
   CefBoxLayoutCToCpp();
 

libcef_dll/ctocpp/views/browser_view_ctocpp.cc

@@ -739,17 +739,17 @@ bool CefBrowserViewCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefBrowserViewCToCpp::CefBrowserViewCToCpp() {
 }
 
-template<> cef_browser_view_t* CefCToCpp<CefBrowserViewCToCpp, CefBrowserView,
-    cef_browser_view_t>::UnwrapDerived(CefWrapperType type,
+template<> cef_browser_view_t* CefCToCppRefCounted<CefBrowserViewCToCpp,
+    CefBrowserView, cef_browser_view_t>::UnwrapDerived(CefWrapperType type,
     CefBrowserView* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefBrowserViewCToCpp, CefBrowserView,
-    cef_browser_view_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefBrowserViewCToCpp,
+    CefBrowserView, cef_browser_view_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefBrowserViewCToCpp, CefBrowserView,
-    cef_browser_view_t>::kWrapperType = WT_BROWSER_VIEW;
+template<> CefWrapperType CefCToCppRefCounted<CefBrowserViewCToCpp,
+    CefBrowserView, cef_browser_view_t>::kWrapperType = WT_BROWSER_VIEW;

libcef_dll/ctocpp/views/browser_view_ctocpp.h

@@ -20,12 +20,12 @@
 
 #include "include/views/cef_browser_view.h"
 #include "include/capi/views/cef_browser_view_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefBrowserViewCToCpp
-    : public CefCToCpp<CefBrowserViewCToCpp, CefBrowserView,
+    : public CefCToCppRefCounted<CefBrowserViewCToCpp, CefBrowserView,
         cef_browser_view_t> {
  public:
   CefBrowserViewCToCpp();

libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc

@@ -266,7 +266,7 @@ void CefBrowserViewDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefBrowserViewDelegateCToCpp::CefBrowserViewDelegateCToCpp() {
 }
 
-template<> cef_browser_view_delegate_t* CefCToCpp<CefBrowserViewDelegateCToCpp,
+template<> cef_browser_view_delegate_t* CefCToCppRefCounted<CefBrowserViewDelegateCToCpp,
     CefBrowserViewDelegate, cef_browser_view_delegate_t>::UnwrapDerived(
     CefWrapperType type, CefBrowserViewDelegate* c) {
   NOTREACHED() << "Unexpected class type: " << type;
@@ -274,10 +274,10 @@ template<> cef_browser_view_delegate_t* CefCToCpp<CefBrowserViewDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefBrowserViewDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefBrowserViewDelegateCToCpp,
     CefBrowserViewDelegate, cef_browser_view_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefBrowserViewDelegateCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefBrowserViewDelegateCToCpp,
     CefBrowserViewDelegate, cef_browser_view_delegate_t>::kWrapperType =
     WT_BROWSER_VIEW_DELEGATE;

libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h

@@ -24,13 +24,13 @@
 #include "include/capi/cef_browser_capi.h"
 #include "include/views/cef_browser_view.h"
 #include "include/capi/views/cef_browser_view_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefBrowserViewDelegateCToCpp
-    : public CefCToCpp<CefBrowserViewDelegateCToCpp, CefBrowserViewDelegate,
-        cef_browser_view_delegate_t> {
+    : public CefCToCppRefCounted<CefBrowserViewDelegateCToCpp,
+        CefBrowserViewDelegate, cef_browser_view_delegate_t> {
  public:
   CefBrowserViewDelegateCToCpp();
 

libcef_dll/ctocpp/views/button_ctocpp.cc

@@ -756,7 +756,7 @@ bool CefButtonCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefButtonCToCpp::CefButtonCToCpp() {
 }
 
-template<> cef_button_t* CefCToCpp<CefButtonCToCpp, CefButton,
+template<> cef_button_t* CefCToCppRefCounted<CefButtonCToCpp, CefButton,
     cef_button_t>::UnwrapDerived(CefWrapperType type, CefButton* c) {
   if (type == WT_LABEL_BUTTON) {
     return reinterpret_cast<cef_button_t*>(CefLabelButtonCToCpp::Unwrap(
@@ -771,9 +771,9 @@ template<> cef_button_t* CefCToCpp<CefButtonCToCpp, CefButton,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefButtonCToCpp, CefButton,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefButtonCToCpp, CefButton,
     cef_button_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefButtonCToCpp, CefButton,
+template<> CefWrapperType CefCToCppRefCounted<CefButtonCToCpp, CefButton,
     cef_button_t>::kWrapperType = WT_BUTTON;

libcef_dll/ctocpp/views/button_ctocpp.h

@@ -22,12 +22,12 @@
 #include "include/capi/views/cef_button_capi.h"
 #include "include/views/cef_label_button.h"
 #include "include/capi/views/cef_label_button_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefButtonCToCpp
-    : public CefCToCpp<CefButtonCToCpp, CefButton, cef_button_t> {
+    : public CefCToCppRefCounted<CefButtonCToCpp, CefButton, cef_button_t> {
  public:
   CefButtonCToCpp();
 

libcef_dll/ctocpp/views/button_delegate_ctocpp.cc

@@ -177,7 +177,7 @@ void CefButtonDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefButtonDelegateCToCpp::CefButtonDelegateCToCpp() {
 }
 
-template<> cef_button_delegate_t* CefCToCpp<CefButtonDelegateCToCpp,
+template<> cef_button_delegate_t* CefCToCppRefCounted<CefButtonDelegateCToCpp,
     CefButtonDelegate, cef_button_delegate_t>::UnwrapDerived(
     CefWrapperType type, CefButtonDelegate* c) {
   if (type == WT_MENU_BUTTON_DELEGATE) {
@@ -190,9 +190,10 @@ template<> cef_button_delegate_t* CefCToCpp<CefButtonDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefButtonDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefButtonDelegateCToCpp,
     CefButtonDelegate, cef_button_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefButtonDelegateCToCpp, CefButtonDelegate,
-    cef_button_delegate_t>::kWrapperType = WT_BUTTON_DELEGATE;
+template<> CefWrapperType CefCToCppRefCounted<CefButtonDelegateCToCpp,
+    CefButtonDelegate, cef_button_delegate_t>::kWrapperType =
+    WT_BUTTON_DELEGATE;

libcef_dll/ctocpp/views/button_delegate_ctocpp.h

@@ -22,12 +22,12 @@
 #include "include/capi/views/cef_button_delegate_capi.h"
 #include "include/views/cef_button.h"
 #include "include/capi/views/cef_button_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefButtonDelegateCToCpp
-    : public CefCToCpp<CefButtonDelegateCToCpp, CefButtonDelegate,
+    : public CefCToCppRefCounted<CefButtonDelegateCToCpp, CefButtonDelegate,
         cef_button_delegate_t> {
  public:
   CefButtonDelegateCToCpp();

libcef_dll/ctocpp/views/display_ctocpp.cc

@@ -200,16 +200,16 @@ int CefDisplayCToCpp::GetRotation() {
 CefDisplayCToCpp::CefDisplayCToCpp() {
 }
 
-template<> cef_display_t* CefCToCpp<CefDisplayCToCpp, CefDisplay,
+template<> cef_display_t* CefCToCppRefCounted<CefDisplayCToCpp, CefDisplay,
     cef_display_t>::UnwrapDerived(CefWrapperType type, CefDisplay* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefDisplayCToCpp, CefDisplay,
-    cef_display_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefDisplayCToCpp,
+    CefDisplay, cef_display_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefDisplayCToCpp, CefDisplay,
+template<> CefWrapperType CefCToCppRefCounted<CefDisplayCToCpp, CefDisplay,
     cef_display_t>::kWrapperType = WT_DISPLAY;

libcef_dll/ctocpp/views/display_ctocpp.h

@@ -20,12 +20,12 @@
 
 #include "include/views/cef_display.h"
 #include "include/capi/views/cef_display_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefDisplayCToCpp
-    : public CefCToCpp<CefDisplayCToCpp, CefDisplay, cef_display_t> {
+    : public CefCToCppRefCounted<CefDisplayCToCpp, CefDisplay, cef_display_t> {
  public:
   CefDisplayCToCpp();
 

libcef_dll/ctocpp/views/fill_layout_ctocpp.cc

@@ -64,16 +64,17 @@ bool CefFillLayoutCToCpp::IsValid() {
 CefFillLayoutCToCpp::CefFillLayoutCToCpp() {
 }
 
-template<> cef_fill_layout_t* CefCToCpp<CefFillLayoutCToCpp, CefFillLayout,
-    cef_fill_layout_t>::UnwrapDerived(CefWrapperType type, CefFillLayout* c) {
+template<> cef_fill_layout_t* CefCToCppRefCounted<CefFillLayoutCToCpp,
+    CefFillLayout, cef_fill_layout_t>::UnwrapDerived(CefWrapperType type,
+    CefFillLayout* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefFillLayoutCToCpp, CefFillLayout,
-    cef_fill_layout_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefFillLayoutCToCpp,
+    CefFillLayout, cef_fill_layout_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefFillLayoutCToCpp, CefFillLayout,
-    cef_fill_layout_t>::kWrapperType = WT_FILL_LAYOUT;
+template<> CefWrapperType CefCToCppRefCounted<CefFillLayoutCToCpp,
+    CefFillLayout, cef_fill_layout_t>::kWrapperType = WT_FILL_LAYOUT;

libcef_dll/ctocpp/views/fill_layout_ctocpp.h

@@ -20,12 +20,13 @@
 
 #include "include/views/cef_fill_layout.h"
 #include "include/capi/views/cef_fill_layout_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefFillLayoutCToCpp
-    : public CefCToCpp<CefFillLayoutCToCpp, CefFillLayout, cef_fill_layout_t> {
+    : public CefCToCppRefCounted<CefFillLayoutCToCpp, CefFillLayout,
+        cef_fill_layout_t> {
  public:
   CefFillLayoutCToCpp();
 

libcef_dll/ctocpp/views/label_button_ctocpp.cc

@@ -941,8 +941,8 @@ bool CefLabelButtonCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefLabelButtonCToCpp::CefLabelButtonCToCpp() {
 }
 
-template<> cef_label_button_t* CefCToCpp<CefLabelButtonCToCpp, CefLabelButton,
-    cef_label_button_t>::UnwrapDerived(CefWrapperType type,
+template<> cef_label_button_t* CefCToCppRefCounted<CefLabelButtonCToCpp,
+    CefLabelButton, cef_label_button_t>::UnwrapDerived(CefWrapperType type,
     CefLabelButton* c) {
   if (type == WT_MENU_BUTTON) {
     return reinterpret_cast<cef_label_button_t*>(CefMenuButtonCToCpp::Unwrap(
@@ -953,9 +953,9 @@ template<> cef_label_button_t* CefCToCpp<CefLabelButtonCToCpp, CefLabelButton,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefLabelButtonCToCpp, CefLabelButton,
-    cef_label_button_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefLabelButtonCToCpp,
+    CefLabelButton, cef_label_button_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefLabelButtonCToCpp, CefLabelButton,
-    cef_label_button_t>::kWrapperType = WT_LABEL_BUTTON;
+template<> CefWrapperType CefCToCppRefCounted<CefLabelButtonCToCpp,
+    CefLabelButton, cef_label_button_t>::kWrapperType = WT_LABEL_BUTTON;

libcef_dll/ctocpp/views/label_button_ctocpp.h

@@ -22,12 +22,12 @@
 #include "include/capi/views/cef_label_button_capi.h"
 #include "include/views/cef_menu_button.h"
 #include "include/capi/views/cef_menu_button_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefLabelButtonCToCpp
-    : public CefCToCpp<CefLabelButtonCToCpp, CefLabelButton,
+    : public CefCToCppRefCounted<CefLabelButtonCToCpp, CefLabelButton,
         cef_label_button_t> {
  public:
   CefLabelButtonCToCpp();

libcef_dll/ctocpp/views/layout_ctocpp.cc

@@ -65,7 +65,7 @@ bool CefLayoutCToCpp::IsValid() {
 CefLayoutCToCpp::CefLayoutCToCpp() {
 }
 
-template<> cef_layout_t* CefCToCpp<CefLayoutCToCpp, CefLayout,
+template<> cef_layout_t* CefCToCppRefCounted<CefLayoutCToCpp, CefLayout,
     cef_layout_t>::UnwrapDerived(CefWrapperType type, CefLayout* c) {
   if (type == WT_BOX_LAYOUT) {
     return reinterpret_cast<cef_layout_t*>(CefBoxLayoutCToCpp::Unwrap(
@@ -80,9 +80,9 @@ template<> cef_layout_t* CefCToCpp<CefLayoutCToCpp, CefLayout,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefLayoutCToCpp, CefLayout,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefLayoutCToCpp, CefLayout,
     cef_layout_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefLayoutCToCpp, CefLayout,
+template<> CefWrapperType CefCToCppRefCounted<CefLayoutCToCpp, CefLayout,
     cef_layout_t>::kWrapperType = WT_LAYOUT;

libcef_dll/ctocpp/views/layout_ctocpp.h

@@ -24,12 +24,12 @@
 #include "include/capi/views/cef_box_layout_capi.h"
 #include "include/views/cef_fill_layout.h"
 #include "include/capi/views/cef_fill_layout_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefLayoutCToCpp
-    : public CefCToCpp<CefLayoutCToCpp, CefLayout, cef_layout_t> {
+    : public CefCToCppRefCounted<CefLayoutCToCpp, CefLayout, cef_layout_t> {
  public:
   CefLayoutCToCpp();
 

libcef_dll/ctocpp/views/menu_button_ctocpp.cc

@@ -975,16 +975,17 @@ bool CefMenuButtonCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefMenuButtonCToCpp::CefMenuButtonCToCpp() {
 }
 
-template<> cef_menu_button_t* CefCToCpp<CefMenuButtonCToCpp, CefMenuButton,
-    cef_menu_button_t>::UnwrapDerived(CefWrapperType type, CefMenuButton* c) {
+template<> cef_menu_button_t* CefCToCppRefCounted<CefMenuButtonCToCpp,
+    CefMenuButton, cef_menu_button_t>::UnwrapDerived(CefWrapperType type,
+    CefMenuButton* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefMenuButtonCToCpp, CefMenuButton,
-    cef_menu_button_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefMenuButtonCToCpp,
+    CefMenuButton, cef_menu_button_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefMenuButtonCToCpp, CefMenuButton,
-    cef_menu_button_t>::kWrapperType = WT_MENU_BUTTON;
+template<> CefWrapperType CefCToCppRefCounted<CefMenuButtonCToCpp,
+    CefMenuButton, cef_menu_button_t>::kWrapperType = WT_MENU_BUTTON;

libcef_dll/ctocpp/views/menu_button_ctocpp.h

@@ -20,12 +20,13 @@
 
 #include "include/views/cef_menu_button.h"
 #include "include/capi/views/cef_menu_button_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefMenuButtonCToCpp
-    : public CefCToCpp<CefMenuButtonCToCpp, CefMenuButton, cef_menu_button_t> {
+    : public CefCToCppRefCounted<CefMenuButtonCToCpp, CefMenuButton,
+        cef_menu_button_t> {
  public:
   CefMenuButtonCToCpp();
 

libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc

@@ -197,7 +197,7 @@ void CefMenuButtonDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefMenuButtonDelegateCToCpp::CefMenuButtonDelegateCToCpp() {
 }
 
-template<> cef_menu_button_delegate_t* CefCToCpp<CefMenuButtonDelegateCToCpp,
+template<> cef_menu_button_delegate_t* CefCToCppRefCounted<CefMenuButtonDelegateCToCpp,
     CefMenuButtonDelegate, cef_menu_button_delegate_t>::UnwrapDerived(
     CefWrapperType type, CefMenuButtonDelegate* c) {
   NOTREACHED() << "Unexpected class type: " << type;
@@ -205,10 +205,10 @@ template<> cef_menu_button_delegate_t* CefCToCpp<CefMenuButtonDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefMenuButtonDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefMenuButtonDelegateCToCpp,
     CefMenuButtonDelegate, cef_menu_button_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefMenuButtonDelegateCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefMenuButtonDelegateCToCpp,
     CefMenuButtonDelegate, cef_menu_button_delegate_t>::kWrapperType =
     WT_MENU_BUTTON_DELEGATE;

libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h

@@ -22,13 +22,13 @@
 #include "include/capi/views/cef_menu_button_delegate_capi.h"
 #include "include/views/cef_menu_button.h"
 #include "include/capi/views/cef_menu_button_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefMenuButtonDelegateCToCpp
-    : public CefCToCpp<CefMenuButtonDelegateCToCpp, CefMenuButtonDelegate,
-        cef_menu_button_delegate_t> {
+    : public CefCToCppRefCounted<CefMenuButtonDelegateCToCpp,
+        CefMenuButtonDelegate, cef_menu_button_delegate_t> {
  public:
   CefMenuButtonDelegateCToCpp();
 

libcef_dll/ctocpp/views/panel_ctocpp.cc

@@ -889,7 +889,7 @@ bool CefPanelCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefPanelCToCpp::CefPanelCToCpp() {
 }
 
-template<> cef_panel_t* CefCToCpp<CefPanelCToCpp, CefPanel,
+template<> cef_panel_t* CefCToCppRefCounted<CefPanelCToCpp, CefPanel,
     cef_panel_t>::UnwrapDerived(CefWrapperType type, CefPanel* c) {
   if (type == WT_WINDOW) {
     return reinterpret_cast<cef_panel_t*>(CefWindowCToCpp::Unwrap(
@@ -900,9 +900,9 @@ template<> cef_panel_t* CefCToCpp<CefPanelCToCpp, CefPanel,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefPanelCToCpp, CefPanel,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefPanelCToCpp, CefPanel,
     cef_panel_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefPanelCToCpp, CefPanel,
+template<> CefWrapperType CefCToCppRefCounted<CefPanelCToCpp, CefPanel,
     cef_panel_t>::kWrapperType = WT_PANEL;

libcef_dll/ctocpp/views/panel_ctocpp.h

@@ -28,12 +28,12 @@
 #include "include/capi/views/cef_layout_capi.h"
 #include "include/views/cef_window.h"
 #include "include/capi/views/cef_window_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefPanelCToCpp
-    : public CefCToCpp<CefPanelCToCpp, CefPanel, cef_panel_t> {
+    : public CefCToCppRefCounted<CefPanelCToCpp, CefPanel, cef_panel_t> {
  public:
   CefPanelCToCpp();
 

libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc

@@ -159,7 +159,7 @@ void CefPanelDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefPanelDelegateCToCpp::CefPanelDelegateCToCpp() {
 }
 
-template<> cef_panel_delegate_t* CefCToCpp<CefPanelDelegateCToCpp,
+template<> cef_panel_delegate_t* CefCToCppRefCounted<CefPanelDelegateCToCpp,
     CefPanelDelegate, cef_panel_delegate_t>::UnwrapDerived(CefWrapperType type,
     CefPanelDelegate* c) {
   if (type == WT_WINDOW_DELEGATE) {
@@ -172,9 +172,9 @@ template<> cef_panel_delegate_t* CefCToCpp<CefPanelDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefPanelDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefPanelDelegateCToCpp,
     CefPanelDelegate, cef_panel_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefPanelDelegateCToCpp, CefPanelDelegate,
-    cef_panel_delegate_t>::kWrapperType = WT_PANEL_DELEGATE;
+template<> CefWrapperType CefCToCppRefCounted<CefPanelDelegateCToCpp,
+    CefPanelDelegate, cef_panel_delegate_t>::kWrapperType = WT_PANEL_DELEGATE;

libcef_dll/ctocpp/views/panel_delegate_ctocpp.h

@@ -20,12 +20,12 @@
 
 #include "include/views/cef_panel_delegate.h"
 #include "include/capi/views/cef_panel_delegate_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefPanelDelegateCToCpp
-    : public CefCToCpp<CefPanelDelegateCToCpp, CefPanelDelegate,
+    : public CefCToCppRefCounted<CefPanelDelegateCToCpp, CefPanelDelegate,
         cef_panel_delegate_t> {
  public:
   CefPanelDelegateCToCpp();

libcef_dll/ctocpp/views/scroll_view_ctocpp.cc

@@ -798,16 +798,17 @@ bool CefScrollViewCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefScrollViewCToCpp::CefScrollViewCToCpp() {
 }
 
-template<> cef_scroll_view_t* CefCToCpp<CefScrollViewCToCpp, CefScrollView,
-    cef_scroll_view_t>::UnwrapDerived(CefWrapperType type, CefScrollView* c) {
+template<> cef_scroll_view_t* CefCToCppRefCounted<CefScrollViewCToCpp,
+    CefScrollView, cef_scroll_view_t>::UnwrapDerived(CefWrapperType type,
+    CefScrollView* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefScrollViewCToCpp, CefScrollView,
-    cef_scroll_view_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefScrollViewCToCpp,
+    CefScrollView, cef_scroll_view_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefScrollViewCToCpp, CefScrollView,
-    cef_scroll_view_t>::kWrapperType = WT_SCROLL_VIEW;
+template<> CefWrapperType CefCToCppRefCounted<CefScrollViewCToCpp,
+    CefScrollView, cef_scroll_view_t>::kWrapperType = WT_SCROLL_VIEW;

libcef_dll/ctocpp/views/scroll_view_ctocpp.h

@@ -20,12 +20,13 @@
 
 #include "include/views/cef_scroll_view.h"
 #include "include/capi/views/cef_scroll_view_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefScrollViewCToCpp
-    : public CefCToCpp<CefScrollViewCToCpp, CefScrollView, cef_scroll_view_t> {
+    : public CefCToCppRefCounted<CefScrollViewCToCpp, CefScrollView,
+        cef_scroll_view_t> {
  public:
   CefScrollViewCToCpp();
 

libcef_dll/ctocpp/views/textfield_ctocpp.cc

@@ -1134,16 +1134,17 @@ bool CefTextfieldCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefTextfieldCToCpp::CefTextfieldCToCpp() {
 }
 
-template<> cef_textfield_t* CefCToCpp<CefTextfieldCToCpp, CefTextfield,
-    cef_textfield_t>::UnwrapDerived(CefWrapperType type, CefTextfield* c) {
+template<> cef_textfield_t* CefCToCppRefCounted<CefTextfieldCToCpp,
+    CefTextfield, cef_textfield_t>::UnwrapDerived(CefWrapperType type,
+    CefTextfield* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTextfieldCToCpp, CefTextfield,
-    cef_textfield_t>::DebugObjCt = 0;
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTextfieldCToCpp,
+    CefTextfield, cef_textfield_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefTextfieldCToCpp, CefTextfield,
+template<> CefWrapperType CefCToCppRefCounted<CefTextfieldCToCpp, CefTextfield,
     cef_textfield_t>::kWrapperType = WT_TEXTFIELD;

libcef_dll/ctocpp/views/textfield_ctocpp.h

@@ -20,12 +20,13 @@
 
 #include "include/views/cef_textfield.h"
 #include "include/capi/views/cef_textfield_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTextfieldCToCpp
-    : public CefCToCpp<CefTextfieldCToCpp, CefTextfield, cef_textfield_t> {
+    : public CefCToCppRefCounted<CefTextfieldCToCpp, CefTextfield,
+        cef_textfield_t> {
  public:
   CefTextfieldCToCpp();
 

libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc

@@ -199,7 +199,7 @@ void CefTextfieldDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefTextfieldDelegateCToCpp::CefTextfieldDelegateCToCpp() {
 }
 
-template<> cef_textfield_delegate_t* CefCToCpp<CefTextfieldDelegateCToCpp,
+template<> cef_textfield_delegate_t* CefCToCppRefCounted<CefTextfieldDelegateCToCpp,
     CefTextfieldDelegate, cef_textfield_delegate_t>::UnwrapDerived(
     CefWrapperType type, CefTextfieldDelegate* c) {
   NOTREACHED() << "Unexpected class type: " << type;
@@ -207,10 +207,10 @@ template<> cef_textfield_delegate_t* CefCToCpp<CefTextfieldDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTextfieldDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTextfieldDelegateCToCpp,
     CefTextfieldDelegate, cef_textfield_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefTextfieldDelegateCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTextfieldDelegateCToCpp,
     CefTextfieldDelegate, cef_textfield_delegate_t>::kWrapperType =
     WT_TEXTFIELD_DELEGATE;

libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h

@@ -22,13 +22,13 @@
 #include "include/capi/views/cef_textfield_delegate_capi.h"
 #include "include/views/cef_textfield.h"
 #include "include/capi/views/cef_textfield_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTextfieldDelegateCToCpp
-    : public CefCToCpp<CefTextfieldDelegateCToCpp, CefTextfieldDelegate,
-        cef_textfield_delegate_t> {
+    : public CefCToCppRefCounted<CefTextfieldDelegateCToCpp,
+        CefTextfieldDelegate, cef_textfield_delegate_t> {
  public:
   CefTextfieldDelegateCToCpp();
 

libcef_dll/ctocpp/views/view_ctocpp.cc

@@ -682,7 +682,7 @@ bool CefViewCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefViewCToCpp::CefViewCToCpp() {
 }
 
-template<> cef_view_t* CefCToCpp<CefViewCToCpp, CefView,
+template<> cef_view_t* CefCToCppRefCounted<CefViewCToCpp, CefView,
     cef_view_t>::UnwrapDerived(CefWrapperType type, CefView* c) {
   if (type == WT_BROWSER_VIEW) {
     return reinterpret_cast<cef_view_t*>(CefBrowserViewCToCpp::Unwrap(
@@ -721,9 +721,9 @@ template<> cef_view_t* CefCToCpp<CefViewCToCpp, CefView,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefViewCToCpp, CefView,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefViewCToCpp, CefView,
     cef_view_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefViewCToCpp, CefView,
+template<> CefWrapperType CefCToCppRefCounted<CefViewCToCpp, CefView,
     cef_view_t>::kWrapperType = WT_VIEW;

libcef_dll/ctocpp/views/view_ctocpp.h

@@ -32,12 +32,12 @@
 #include "include/capi/views/cef_textfield_capi.h"
 #include "include/views/cef_window.h"
 #include "include/capi/views/cef_window_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefViewCToCpp
-    : public CefCToCpp<CefViewCToCpp, CefView, cef_view_t> {
+    : public CefCToCppRefCounted<CefViewCToCpp, CefView, cef_view_t> {
  public:
   CefViewCToCpp();
 

libcef_dll/ctocpp/views/view_delegate_ctocpp.cc

@@ -158,7 +158,7 @@ void CefViewDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefViewDelegateCToCpp::CefViewDelegateCToCpp() {
 }
 
-template<> cef_view_delegate_t* CefCToCpp<CefViewDelegateCToCpp,
+template<> cef_view_delegate_t* CefCToCppRefCounted<CefViewDelegateCToCpp,
     CefViewDelegate, cef_view_delegate_t>::UnwrapDerived(CefWrapperType type,
     CefViewDelegate* c) {
   if (type == WT_BROWSER_VIEW_DELEGATE) {
@@ -196,9 +196,9 @@ template<> cef_view_delegate_t* CefCToCpp<CefViewDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefViewDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefViewDelegateCToCpp,
     CefViewDelegate, cef_view_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefViewDelegateCToCpp, CefViewDelegate,
-    cef_view_delegate_t>::kWrapperType = WT_VIEW_DELEGATE;
+template<> CefWrapperType CefCToCppRefCounted<CefViewDelegateCToCpp,
+    CefViewDelegate, cef_view_delegate_t>::kWrapperType = WT_VIEW_DELEGATE;

libcef_dll/ctocpp/views/view_delegate_ctocpp.h

@@ -22,12 +22,12 @@
 #include "include/capi/views/cef_view_delegate_capi.h"
 #include "include/views/cef_view.h"
 #include "include/capi/views/cef_view_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefViewDelegateCToCpp
-    : public CefCToCpp<CefViewDelegateCToCpp, CefViewDelegate,
+    : public CefCToCppRefCounted<CefViewDelegateCToCpp, CefViewDelegate,
         cef_view_delegate_t> {
  public:
   CefViewDelegateCToCpp();

libcef_dll/ctocpp/views/window_ctocpp.cc

@@ -1351,16 +1351,16 @@ bool CefWindowCToCpp::ConvertPointFromView(CefRefPtr<CefView> view,
 CefWindowCToCpp::CefWindowCToCpp() {
 }
 
-template<> cef_window_t* CefCToCpp<CefWindowCToCpp, CefWindow,
+template<> cef_window_t* CefCToCppRefCounted<CefWindowCToCpp, CefWindow,
     cef_window_t>::UnwrapDerived(CefWrapperType type, CefWindow* c) {
   NOTREACHED() << "Unexpected class type: " << type;
   return NULL;
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefWindowCToCpp, CefWindow,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefWindowCToCpp, CefWindow,
     cef_window_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefWindowCToCpp, CefWindow,
+template<> CefWrapperType CefCToCppRefCounted<CefWindowCToCpp, CefWindow,
     cef_window_t>::kWrapperType = WT_WINDOW;

libcef_dll/ctocpp/views/window_ctocpp.h

@@ -21,12 +21,12 @@
 #include <vector>
 #include "include/views/cef_window.h"
 #include "include/capi/views/cef_window_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefWindowCToCpp
-    : public CefCToCpp<CefWindowCToCpp, CefWindow, cef_window_t> {
+    : public CefCToCppRefCounted<CefWindowCToCpp, CefWindow, cef_window_t> {
  public:
   CefWindowCToCpp();
 

libcef_dll/ctocpp/views/window_delegate_ctocpp.cc

@@ -293,7 +293,7 @@ void CefWindowDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
 CefWindowDelegateCToCpp::CefWindowDelegateCToCpp() {
 }
 
-template<> cef_window_delegate_t* CefCToCpp<CefWindowDelegateCToCpp,
+template<> cef_window_delegate_t* CefCToCppRefCounted<CefWindowDelegateCToCpp,
     CefWindowDelegate, cef_window_delegate_t>::UnwrapDerived(
     CefWrapperType type, CefWindowDelegate* c) {
   NOTREACHED() << "Unexpected class type: " << type;
@@ -301,9 +301,10 @@ template<> cef_window_delegate_t* CefCToCpp<CefWindowDelegateCToCpp,
 }
 
 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefWindowDelegateCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefWindowDelegateCToCpp,
     CefWindowDelegate, cef_window_delegate_t>::DebugObjCt = 0;
 #endif
 
-template<> CefWrapperType CefCToCpp<CefWindowDelegateCToCpp, CefWindowDelegate,
-    cef_window_delegate_t>::kWrapperType = WT_WINDOW_DELEGATE;
+template<> CefWrapperType CefCToCppRefCounted<CefWindowDelegateCToCpp,
+    CefWindowDelegate, cef_window_delegate_t>::kWrapperType =
+    WT_WINDOW_DELEGATE;

libcef_dll/ctocpp/views/window_delegate_ctocpp.h

@@ -22,12 +22,12 @@
 #include "include/capi/views/cef_window_delegate_capi.h"
 #include "include/views/cef_window.h"
 #include "include/capi/views/cef_window_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
 
 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefWindowDelegateCToCpp
-    : public CefCToCpp<CefWindowDelegateCToCpp, CefWindowDelegate,
+    : public CefCToCppRefCounted<CefWindowDelegateCToCpp, CefWindowDelegate,
         cef_window_delegate_t> {
  public:
   CefWindowDelegateCToCpp();