Rename CefBase to CefBaseRefCounted (issue #2090)

cef_paths2.gypi

@@ -88,13 +88,13 @@
       'include/internal/cef_types_linux.h',
     ],
     'libcef_sources_common': [
-      'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/cpptoc/cpptoc_ref_counted.h',
       'libcef_dll/cpptoc/cpptoc_scoped.h',
-      'libcef_dll/ctocpp/base_ctocpp.cc',
-      'libcef_dll/ctocpp/base_ctocpp.h',
+      'libcef_dll/ctocpp/base_ref_counted_ctocpp.cc',
+      'libcef_dll/ctocpp/base_ref_counted_ctocpp.h',
       'libcef_dll/ctocpp/base_scoped_ctocpp.cc',
       'libcef_dll/ctocpp/base_scoped_ctocpp.h',
-      'libcef_dll/ctocpp/ctocpp.h',
+      'libcef_dll/ctocpp/ctocpp_ref_counted.h',
       'libcef_dll/ctocpp/ctocpp_scoped.h',
       'libcef_dll/libcef_dll.cc',
       'libcef_dll/libcef_dll2.cc',
@@ -119,13 +119,13 @@
       'libcef_dll/base/cef_weak_ptr.cc',
     ],
     'libcef_dll_wrapper_sources_common': [
-      'libcef_dll/cpptoc/base_cpptoc.cc',
-      'libcef_dll/cpptoc/base_cpptoc.h',
+      'libcef_dll/cpptoc/base_ref_counted_cpptoc.cc',
+      'libcef_dll/cpptoc/base_ref_counted_cpptoc.h',
       'libcef_dll/cpptoc/base_scoped_cpptoc.cc',
       'libcef_dll/cpptoc/base_scoped_cpptoc.h',
-      'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/cpptoc/cpptoc_ref_counted.h',
       'libcef_dll/cpptoc/cpptoc_scoped.h',
-      'libcef_dll/ctocpp/ctocpp.h',
+      'libcef_dll/ctocpp/ctocpp_ref_counted.h',
       'libcef_dll/ctocpp/ctocpp_scoped.h',
       'libcef_dll/ptr_util.h',
       'libcef_dll/transfer_util.cc',

include/capi/cef_app_capi.h

@@ -59,7 +59,7 @@ typedef struct _cef_app_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Provides an opportunity to view and/or modify command-line arguments before

include/capi/cef_auth_callback_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_auth_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue the authentication request.

include/capi/cef_base_capi.h

@@ -47,7 +47,7 @@ extern "C" {
 ///
 // All ref-counted framework structures must include this structure first.
 ///
-typedef struct _cef_base_t {
+typedef struct _cef_base_ref_counted_t {
   ///
   // Size of the data structure.
   ///
@@ -57,20 +57,20 @@ typedef struct _cef_base_t {
   // Called to increment the reference count for the object. Should be called
   // for every new copy of a pointer to a given object.
   ///
-  void (CEF_CALLBACK *add_ref)(struct _cef_base_t* self);
+  void (CEF_CALLBACK *add_ref)(struct _cef_base_ref_counted_t* self);
 
   ///
   // Called to decrement the reference count for the object. If the reference
   // count falls to 0 the object should self-delete. Returns true (1) if the
   // resulting reference count is 0.
   ///
-  int (CEF_CALLBACK *release)(struct _cef_base_t* self);
+  int (CEF_CALLBACK *release)(struct _cef_base_ref_counted_t* self);
 
   ///
   // Returns true (1) if the current reference count is 1.
   ///
-  int (CEF_CALLBACK *has_one_ref)(struct _cef_base_t* self);
-} cef_base_t;
+  int (CEF_CALLBACK *has_one_ref)(struct _cef_base_ref_counted_t* self);
+} cef_base_ref_counted_t;
 
 
 ///
@@ -90,11 +90,11 @@ typedef struct _cef_base_scoped_t {
 } cef_base_scoped_t;
 
 
-// Check that the structure |s|, which is defined with a cef_base_t member named
-// |base|, is large enough to contain the specified member |f|.
+// Check that the structure |s|, which is defined with a size_t member at the
+// top, is large enough to contain the specified member |f|.
 #define CEF_MEMBER_EXISTS(s, f)   \
   ((intptr_t)&((s)->f) - (intptr_t)(s) + sizeof((s)->f) <= \
-  reinterpret_cast<cef_base_t*>(s)->size)
+  *reinterpret_cast<size_t*>(s))
 
 #define CEF_MEMBER_MISSING(s, f)  (!CEF_MEMBER_EXISTS(s, f) || !((s)->f))
 

include/capi/cef_browser_capi.h

@@ -63,7 +63,7 @@ typedef struct _cef_browser_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the browser host object. This function can only be called in the
@@ -193,7 +193,7 @@ typedef struct _cef_run_file_dialog_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called asynchronously after the file dialog is dismissed.
@@ -216,7 +216,7 @@ typedef struct _cef_navigation_entry_visitor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be executed. Do not keep a reference to |entry| outside of
@@ -239,7 +239,7 @@ typedef struct _cef_pdf_print_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be executed when the PDF printing has completed. |path| is
@@ -260,7 +260,7 @@ typedef struct _cef_download_image_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be executed when the image download has completed.
@@ -285,7 +285,7 @@ typedef struct _cef_browser_host_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the hosted browser object.

include/capi/cef_browser_process_handler_capi.h

@@ -57,7 +57,7 @@ typedef struct _cef_browser_process_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called on the browser process UI thread immediately after the CEF context

include/capi/cef_callback_capi.h

@@ -52,7 +52,7 @@ typedef struct _cef_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue processing.
@@ -73,7 +73,7 @@ typedef struct _cef_completion_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called once the task is complete.

include/capi/cef_client_capi.h

@@ -67,7 +67,7 @@ typedef struct _cef_client_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Return the handler for context menus. If no handler is provided the default

include/capi/cef_command_line_capi.h

@@ -59,7 +59,7 @@ typedef struct _cef_command_line_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. Do not call any other functions

include/capi/cef_context_menu_handler_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_run_context_menu_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Complete context menu display by selecting the specified |command_id| and
@@ -80,7 +80,7 @@ typedef struct _cef_context_menu_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called before a context menu is displayed. |params| provides information
@@ -140,7 +140,7 @@ typedef struct _cef_context_menu_params_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the X coordinate of the mouse where the context menu was invoked.

include/capi/cef_cookie_capi.h

@@ -57,7 +57,7 @@ typedef struct _cef_cookie_manager_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Set the schemes supported by this manager. The default schemes ("http",
@@ -172,7 +172,7 @@ typedef struct _cef_cookie_visitor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called once for each cookie. |count| is the 0-based
@@ -195,7 +195,7 @@ typedef struct _cef_set_cookie_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called upon completion. |success| will be true (1) if
@@ -214,7 +214,7 @@ typedef struct _cef_delete_cookies_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called upon completion. |num_deleted| will be the

include/capi/cef_dialog_handler_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_file_dialog_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue the file selection. |selected_accept_filter| should be the 0-based
@@ -80,7 +80,7 @@ typedef struct _cef_dialog_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called to run a file chooser dialog. |mode| represents the type of dialog

include/capi/cef_display_handler_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_display_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when a frame's address has changed.

include/capi/cef_dom_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_domvisitor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method executed for visiting the DOM. The document object passed to this
@@ -77,7 +77,7 @@ typedef struct _cef_domdocument_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the document type.
@@ -177,7 +177,7 @@ typedef struct _cef_domnode_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the type for this node.

include/capi/cef_download_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_before_download_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Call to continue the download. Set |download_path| to the full file path
@@ -74,7 +74,7 @@ typedef struct _cef_download_item_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Call to cancel the download.
@@ -101,7 +101,7 @@ typedef struct _cef_download_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called before a download begins. |suggested_name| is the suggested name for

include/capi/cef_download_item_capi.h

@@ -52,7 +52,7 @@ typedef struct _cef_download_item_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. Do not call any other functions

include/capi/cef_drag_data_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_drag_data_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns a copy of the current object.

include/capi/cef_drag_handler_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_drag_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when an external drag event enters the browser window. |dragData|

include/capi/cef_find_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_find_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called to report find results returned by cef_browser_host_t::find().

include/capi/cef_focus_handler_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_focus_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when the browser component is about to loose focus. For instance, if

include/capi/cef_frame_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_frame_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // True if this object is currently attached to a valid frame.

include/capi/cef_geolocation_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_get_geolocation_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called with the 'best available' location information or, if the location

include/capi/cef_geolocation_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_geolocation_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Call to allow or deny geolocation access.
@@ -73,7 +73,7 @@ typedef struct _cef_geolocation_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when a page requests permission to access geolocation information.

include/capi/cef_image_capi.h

@@ -58,7 +58,7 @@ typedef struct _cef_image_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this Image is NULL.

include/capi/cef_jsdialog_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_jsdialog_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue the JS dialog request. Set |success| to true (1) if the OK button
@@ -73,7 +73,7 @@ typedef struct _cef_jsdialog_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be

include/capi/cef_keyboard_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_keyboard_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called before a keyboard event is sent to the renderer. |event| contains

include/capi/cef_life_span_handler_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_life_span_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called on the IO thread before a new popup browser is created. The

include/capi/cef_load_handler_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_load_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when the loading state has changed. This callback will be executed

include/capi/cef_menu_model_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_menu_model_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Clears the menu. Returns true (1) on success.

include/capi/cef_menu_model_delegate_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_menu_model_delegate_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Perform the action associated with the specified |command_id| and optional

include/capi/cef_navigation_entry_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_navigation_entry_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. Do not call any other functions

include/capi/cef_print_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_print_dialog_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue printing with the specified |settings|.
@@ -76,7 +76,7 @@ typedef struct _cef_print_job_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Indicate completion of the print job.
@@ -93,7 +93,7 @@ typedef struct _cef_print_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called when printing has started for the specified |browser|. This function

include/capi/cef_print_settings_capi.h

@@ -52,7 +52,7 @@ typedef struct _cef_print_settings_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. Do not call any other functions

include/capi/cef_process_message_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_process_message_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. Do not call any other functions

include/capi/cef_render_handler_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_render_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called to retrieve the root window rectangle in screen coordinates. Return

include/capi/cef_render_process_handler_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_render_process_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called after the render process main thread has been created. |extra_info|

include/capi/cef_request_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_request_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is read-only.
@@ -205,7 +205,7 @@ typedef struct _cef_post_data_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is read-only.
@@ -265,7 +265,7 @@ typedef struct _cef_post_data_element_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is read-only.

include/capi/cef_request_context_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_resolve_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called after the ResolveHost request has completed. |result| will be the
@@ -89,7 +89,7 @@ typedef struct _cef_request_context_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is pointing to the same context as |that|

include/capi/cef_request_context_handler_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_request_context_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called on the browser process IO thread to retrieve the cookie manager. If

include/capi/cef_request_handler_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_request_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Continue the url request. If |allow| is true (1) the request will be
@@ -83,7 +83,7 @@ typedef struct _cef_select_client_certificate_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Chooses the specified certificate for client certificate authentication.
@@ -103,7 +103,7 @@ typedef struct _cef_request_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called on the UI thread before browser navigation. Return true (1) to

include/capi/cef_resource_bundle_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_resource_bundle_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the localized string for the specified |string_id| or an NULL

include/capi/cef_resource_bundle_handler_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_resource_bundle_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called to retrieve a localized translation for the specified |string_id|.

include/capi/cef_resource_handler_capi.h

@@ -58,7 +58,7 @@ typedef struct _cef_resource_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Begin processing the request. To handle the request return true (1) and

include/capi/cef_response_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_response_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is read-only.

include/capi/cef_response_filter_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_response_filter_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Initialize the response filter. Will only be called a single time. The

include/capi/cef_scheme_capi.h

@@ -131,7 +131,7 @@ typedef struct _cef_scheme_handler_factory_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Return a new resource handler instance to handle the request or an NULL

include/capi/cef_ssl_info_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_sslinfo_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns a bitmask containing any and all problems verifying the server

include/capi/cef_ssl_status_capi.h

@@ -54,7 +54,7 @@ typedef struct _cef_sslstatus_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if the status is related to a secure SSL/TLS connection.

include/capi/cef_stream_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_read_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Read raw binary data.
@@ -95,7 +95,7 @@ typedef struct _cef_stream_reader_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Read raw binary data.
@@ -156,7 +156,7 @@ typedef struct _cef_write_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Write raw binary data.
@@ -198,7 +198,7 @@ typedef struct _cef_stream_writer_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Write raw binary data.

include/capi/cef_string_visitor_capi.h

@@ -52,7 +52,7 @@ typedef struct _cef_string_visitor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be executed.

include/capi/cef_task_capi.h

@@ -57,7 +57,7 @@ typedef struct _cef_task_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be executed on the target thread.
@@ -79,7 +79,7 @@ typedef struct _cef_task_runner_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is pointing to the same task runner as

include/capi/cef_thread_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_thread_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the cef_task_tRunner that will execute code on this thread's

include/capi/cef_trace_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_end_tracing_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called after all processes have sent their trace data. |tracing_file| is

include/capi/cef_urlrequest_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_urlrequest_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the request object used to create this URL request. The returned
@@ -133,7 +133,7 @@ typedef struct _cef_urlrequest_client_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Notifies the client that the request has completed. Use the

include/capi/cef_v8_capi.h

@@ -63,7 +63,7 @@ typedef struct _cef_v8context_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the task runner associated with this context. V8 handles can only
@@ -161,7 +161,7 @@ typedef struct _cef_v8handler_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Handle execution of the function identified by |name|. |object| is the
@@ -187,7 +187,7 @@ typedef struct _cef_v8accessor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Handle retrieval the accessor value identified by |name|. |object| is the
@@ -225,7 +225,7 @@ typedef struct _cef_v8interceptor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Handle retrieval of the interceptor value identified by |name|. |object| is
@@ -285,7 +285,7 @@ typedef struct _cef_v8exception_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the exception message.
@@ -352,7 +352,7 @@ typedef struct _cef_v8value_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if the underlying handle is valid and it can be accessed
@@ -585,12 +585,12 @@ typedef struct _cef_v8value_t {
   // called on user created objects.
   ///
   int (CEF_CALLBACK *set_user_data)(struct _cef_v8value_t* self,
-      struct _cef_base_t* user_data);
+      struct _cef_base_ref_counted_t* user_data);
 
   ///
   // Returns the user data, if any, assigned to this object.
   ///
-  struct _cef_base_t* (CEF_CALLBACK *get_user_data)(
+  struct _cef_base_ref_counted_t* (CEF_CALLBACK *get_user_data)(
       struct _cef_v8value_t* self);
 
   ///
@@ -752,7 +752,7 @@ typedef struct _cef_v8stack_trace_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if the underlying handle is valid and it can be accessed
@@ -792,7 +792,7 @@ typedef struct _cef_v8stack_frame_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if the underlying handle is valid and it can be accessed

include/capi/cef_values_capi.h

@@ -57,7 +57,7 @@ typedef struct _cef_value_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if the underlying data is valid. This will always be true
@@ -228,7 +228,7 @@ typedef struct _cef_binary_value_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. This object may become invalid if
@@ -293,7 +293,7 @@ typedef struct _cef_dictionary_value_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. This object may become invalid if
@@ -520,7 +520,7 @@ typedef struct _cef_list_value_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns true (1) if this object is valid. This object may become invalid if

include/capi/cef_waitable_event_capi.h

@@ -60,7 +60,7 @@ typedef struct _cef_waitable_event_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Put the event in the un-signaled state.

include/capi/cef_web_plugin_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_web_plugin_info_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the plugin name (i.e. Flash).
@@ -93,7 +93,7 @@ typedef struct _cef_web_plugin_info_visitor_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called once for each plugin. |count| is the 0-based
@@ -114,7 +114,7 @@ typedef struct _cef_web_plugin_unstable_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called for the requested plugin. |unstable| will be
@@ -136,7 +136,7 @@ typedef struct _cef_register_cdm_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Method that will be called when CDM registration is complete. |result| will

include/capi/cef_x509_certificate_capi.h

@@ -53,7 +53,7 @@ typedef struct _cef_x509cert_principal_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns a name that can be used to represent the issuer. It tries in this
@@ -125,7 +125,7 @@ typedef struct _cef_x509certificate_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the subject of the X.509 certificate. For HTTPS server certificates

include/capi/cef_xml_reader_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_xml_reader_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Moves the cursor to the next node in the document. This function must be

include/capi/cef_zip_reader_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_zip_reader_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Moves the cursor to the first file in the archive. Returns true (1) if the

include/capi/test/cef_translator_test_capi.h

@@ -65,7 +65,7 @@ typedef struct _cef_translator_test_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
 
   // PRIMITIVE VALUES
@@ -527,7 +527,7 @@ typedef struct _cef_translator_test_ref_ptr_library_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Return a value.
@@ -618,7 +618,7 @@ typedef struct _cef_translator_test_ref_ptr_client_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Return a value.

include/capi/views/cef_display_capi.h

@@ -57,7 +57,7 @@ typedef struct _cef_display_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns the unique identifier for this Display.

include/capi/views/cef_layout_capi.h

@@ -56,7 +56,7 @@ typedef struct _cef_layout_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.

include/capi/views/cef_view_capi.h

@@ -61,7 +61,7 @@ typedef struct _cef_view_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Returns this View as a BrowserView or NULL if this is not a BrowserView.

include/capi/views/cef_view_delegate_capi.h

@@ -55,7 +55,7 @@ typedef struct _cef_view_delegate_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Return the preferred size for |view|. The Layout will use this information

include/cef_app.h

@@ -143,7 +143,7 @@ void CefEnableHighDPISupport();
 // called by the process and/or thread indicated.
 ///
 /*--cef(source=client,no_debugct_check)--*/
-class CefApp : public virtual CefBase {
+class CefApp : public virtual CefBaseRefCounted {
  public:
   ///
   // Provides an opportunity to view and/or modify command-line arguments before

include/cef_auth_callback.h

@@ -45,7 +45,7 @@
 // requests.
 ///
 /*--cef(source=library)--*/
-class CefAuthCallback : public virtual CefBase {
+class CefAuthCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue the authentication request.

include/cef_base.h

@@ -50,7 +50,7 @@
 ///
 // All ref-counted framework classes must extend this class.
 ///
-class CefBase {
+class CefBaseRefCounted {
  public:
   ///
   // Called to increment the reference count for the object. Should be called
@@ -70,7 +70,7 @@ class CefBase {
   virtual bool HasOneRef() const =0;
 
  protected:
-  virtual ~CefBase() {}
+  virtual ~CefBaseRefCounted() {}
 };
 
 ///
@@ -148,7 +148,7 @@ class CefRefCount {
 // #include "include/base/cef_lock.h"
 //
 // // Class declaration.
-// class MyClass : public CefBase {
+// class MyClass : public CefBaseRefCounted {
 //  public:
 //   MyClass() : value_(0) {}
 //   // Method that may be called on multiple threads.

include/cef_browser.h

@@ -58,7 +58,7 @@ class CefClient;
 // this class may only be called on the main thread.
 ///
 /*--cef(source=library)--*/
-class CefBrowser : public virtual CefBase {
+class CefBrowser : public virtual CefBaseRefCounted {
  public:
   ///
   // Returns the browser host object. This method can only be called in the
@@ -197,7 +197,7 @@ class CefBrowser : public virtual CefBase {
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefRunFileDialogCallback : public virtual CefBase {
+class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Called asynchronously after the file dialog is dismissed.
@@ -218,7 +218,7 @@ class CefRunFileDialogCallback : public virtual CefBase {
 // this class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefNavigationEntryVisitor : public virtual CefBase {
+class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be executed. Do not keep a reference to |entry| outside of
@@ -240,7 +240,7 @@ class CefNavigationEntryVisitor : public virtual CefBase {
 // will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefPdfPrintCallback : public virtual CefBase {
+class CefPdfPrintCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be executed when the PDF printing has completed. |path|
@@ -257,7 +257,7 @@ class CefPdfPrintCallback : public virtual CefBase {
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDownloadImageCallback : public virtual CefBase {
+class CefDownloadImageCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be executed when the image download has completed.
@@ -280,7 +280,7 @@ class CefDownloadImageCallback : public virtual CefBase {
 // comments.
 ///
 /*--cef(source=library)--*/
-class CefBrowserHost : public virtual CefBase {
+class CefBrowserHost : public virtual CefBaseRefCounted {
  public:
   typedef cef_drag_operations_mask_t DragOperationsMask;
   typedef cef_file_dialog_mode_t FileDialogMode;

include/cef_browser_process_handler.h

@@ -48,7 +48,7 @@
 // will be called on the browser process main thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
-class CefBrowserProcessHandler : public virtual CefBase {
+class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called on the browser process UI thread immediately after the CEF context

include/cef_callback.h

@@ -44,7 +44,7 @@
 // Generic callback interface used for asynchronous continuation.
 ///
 /*--cef(source=library)--*/
-class CefCallback : public virtual CefBase {
+class CefCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue processing.
@@ -63,7 +63,7 @@ class CefCallback : public virtual CefBase {
 // Generic callback interface used for asynchronous completion.
 ///
 /*--cef(source=client)--*/
-class CefCompletionCallback : public virtual CefBase {
+class CefCompletionCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be called once the task is complete.

include/cef_client.h

@@ -59,7 +59,7 @@
 // Implement this interface to provide handler implementations.
 ///
 /*--cef(source=client,no_debugct_check)--*/
-class CefClient : public virtual CefBase {
+class CefClient : public virtual CefBaseRefCounted {
  public:
   ///
   // Return the handler for context menus. If no handler is provided the default

include/cef_command_line.h

@@ -53,7 +53,7 @@
 // used before CefInitialize() is called.
 ///
 /*--cef(source=library,no_debugct_check)--*/
-class CefCommandLine : public virtual CefBase {
+class CefCommandLine : public virtual CefBaseRefCounted {
  public:
   typedef std::vector<CefString> ArgumentList;
   typedef std::map<CefString, CefString> SwitchMap;

include/cef_context_menu_handler.h

@@ -50,7 +50,7 @@ class CefContextMenuParams;
 // Callback interface used for continuation of custom context menu display.
 ///
 /*--cef(source=library)--*/
-class CefRunContextMenuCallback : public virtual CefBase {
+class CefRunContextMenuCallback : public virtual CefBaseRefCounted {
  public:
   typedef cef_event_flags_t EventFlags;
 
@@ -74,7 +74,7 @@ class CefRunContextMenuCallback : public virtual CefBase {
 // class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefContextMenuHandler : public virtual CefBase {
+class CefContextMenuHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_event_flags_t EventFlags;
 
@@ -139,7 +139,7 @@ class CefContextMenuHandler : public virtual CefBase {
 // can only be accessed on browser process the UI thread.
 ///
 /*--cef(source=library)--*/
-class CefContextMenuParams : public virtual CefBase {
+class CefContextMenuParams : public virtual CefBaseRefCounted {
  public:
   typedef cef_context_menu_type_flags_t TypeFlags;
   typedef cef_context_menu_media_type_t MediaType;

include/cef_cookie.h

@@ -51,7 +51,7 @@ class CefDeleteCookiesCallback;
 // any thread unless otherwise indicated.
 ///
 /*--cef(source=library,no_debugct_check)--*/
-class CefCookieManager : public virtual CefBase {
+class CefCookieManager : public virtual CefBaseRefCounted {
  public:
   ///
   // Returns the global cookie manager. By default data will be stored at
@@ -171,7 +171,7 @@ class CefCookieManager : public virtual CefBase {
 // will always be called on the IO thread.
 ///
 /*--cef(source=client)--*/
-class CefCookieVisitor : public virtual CefBase {
+class CefCookieVisitor : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be called once for each cookie. |count| is the 0-based
@@ -191,7 +191,7 @@ class CefCookieVisitor : public virtual CefBase {
 // CefCookieManager::SetCookie().
 ///
 /*--cef(source=client)--*/
-class CefSetCookieCallback : public virtual CefBase {
+class CefSetCookieCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be called upon completion. |success| will be true if the
@@ -207,7 +207,7 @@ class CefSetCookieCallback : public virtual CefBase {
 // CefCookieManager::DeleteCookies().
 ///
 /*--cef(source=client)--*/
-class CefDeleteCookiesCallback : public virtual CefBase {
+class CefDeleteCookiesCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Method that will be called upon completion. |num_deleted| will be the

include/cef_dialog_handler.h

@@ -45,7 +45,7 @@
 // Callback interface for asynchronous continuation of file dialog requests.
 ///
 /*--cef(source=library)--*/
-class CefFileDialogCallback : public virtual CefBase {
+class CefFileDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue the file selection. |selected_accept_filter| should be the 0-based
@@ -72,7 +72,7 @@ class CefFileDialogCallback : public virtual CefBase {
 // will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDialogHandler : public virtual CefBase {
+class CefDialogHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_file_dialog_mode_t FileDialogMode;
 

include/cef_display_handler.h

@@ -47,7 +47,7 @@
 // The methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDisplayHandler : public virtual CefBase {
+class CefDisplayHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called when a frame's address has changed.

include/cef_dom.h

@@ -49,7 +49,7 @@ class CefDOMNode;
 // be called on the render process main thread.
 ///
 /*--cef(source=client)--*/
-class CefDOMVisitor : public virtual CefBase {
+class CefDOMVisitor : public virtual CefBaseRefCounted {
  public:
   ///
   // Method executed for visiting the DOM. The document object passed to this
@@ -68,7 +68,7 @@ class CefDOMVisitor : public virtual CefBase {
 // be called on the render process main thread thread.
 ///
 /*--cef(source=library)--*/
-class CefDOMDocument : public virtual CefBase {
+class CefDOMDocument : public virtual CefBaseRefCounted {
  public:
   typedef cef_dom_document_type_t Type;
 
@@ -164,7 +164,7 @@ class CefDOMDocument : public virtual CefBase {
 // called on the render process main thread.
 ///
 /*--cef(source=library)--*/
-class CefDOMNode : public virtual CefBase {
+class CefDOMNode : public virtual CefBaseRefCounted {
  public:
   typedef std::map<CefString, CefString> AttributeMap;
   typedef cef_dom_node_type_t Type;

include/cef_download_handler.h

@@ -47,7 +47,7 @@
 // Callback interface used to asynchronously continue a download.
 ///
 /*--cef(source=library)--*/
-class CefBeforeDownloadCallback : public virtual CefBase {
+class CefBeforeDownloadCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Call to continue the download. Set |download_path| to the full file path
@@ -64,7 +64,7 @@ class CefBeforeDownloadCallback : public virtual CefBase {
 // Callback interface used to asynchronously cancel a download.
 ///
 /*--cef(source=library)--*/
-class CefDownloadItemCallback : public virtual CefBase {
+class CefDownloadItemCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Call to cancel the download.
@@ -91,7 +91,7 @@ class CefDownloadItemCallback : public virtual CefBase {
 // on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDownloadHandler : public virtual CefBase {
+class CefDownloadHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called before a download begins. |suggested_name| is the suggested name for

include/cef_download_item.h

@@ -44,7 +44,7 @@
 // Class used to represent a download item.
 ///
 /*--cef(source=library)--*/
-class CefDownloadItem : public virtual CefBase {
+class CefDownloadItem : public virtual CefBaseRefCounted {
  public:
   ///
   // Returns true if this object is valid. Do not call any other methods if this

include/cef_drag_data.h

@@ -47,7 +47,7 @@
 // on any thread.
 ///
 /*--cef(source=library)--*/
-class CefDragData : public virtual CefBase {
+class CefDragData : public virtual CefBaseRefCounted {
  public:
   ///
   // Create a new CefDragData object.

include/cef_drag_handler.h

@@ -47,7 +47,7 @@
 // this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDragHandler : public virtual CefBase {
+class CefDragHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_drag_operations_mask_t DragOperationsMask;
 

include/cef_find_handler.h

@@ -46,7 +46,7 @@
 // methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefFindHandler : public virtual CefBase {
+class CefFindHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called to report find results returned by CefBrowserHost::Find().

include/cef_focus_handler.h

@@ -48,7 +48,7 @@
 // this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefFocusHandler : public virtual CefBase {
+class CefFocusHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_focus_source_t FocusSource;
 

include/cef_frame.h

@@ -54,7 +54,7 @@ class CefV8Context;
 // methods of this class may only be called on the main thread.
 ///
 /*--cef(source=library)--*/
-class CefFrame : public virtual CefBase {
+class CefFrame : public virtual CefBaseRefCounted {
  public:
   ///
   // True if this object is currently attached to a valid frame.

include/cef_geolocation.h

@@ -45,7 +45,7 @@
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefGetGeolocationCallback : public virtual CefBase {
+class CefGetGeolocationCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Called with the 'best available' location information or, if the location

include/cef_geolocation_handler.h

@@ -46,7 +46,7 @@
 // permission requests.
 ///
 /*--cef(source=library)--*/
-class CefGeolocationCallback : public virtual CefBase {
+class CefGeolocationCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Call to allow or deny geolocation access.
@@ -62,7 +62,7 @@ class CefGeolocationCallback : public virtual CefBase {
 // thread.
 ///
 /*--cef(source=client)--*/
-class CefGeolocationHandler : public virtual CefBase {
+class CefGeolocationHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called when a page requests permission to access geolocation information.

include/cef_image.h

@@ -50,7 +50,7 @@
 // be called on the browser process UI thread.
 ///
 /*--cef(source=library)--*/
-class CefImage : public virtual CefBase {
+class CefImage : public virtual CefBaseRefCounted {
  public:
   ///
   // Create a new CefImage. It will initially be empty. Use the Add*() methods

include/cef_jsdialog_handler.h

@@ -46,7 +46,7 @@
 // requests.
 ///
 /*--cef(source=library)--*/
-class CefJSDialogCallback : public virtual CefBase {
+class CefJSDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue the JS dialog request. Set |success| to true if the OK button was
@@ -63,7 +63,7 @@ class CefJSDialogCallback : public virtual CefBase {
 // methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefJSDialogHandler : public virtual CefBase {
+class CefJSDialogHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_jsdialog_type_t JSDialogType;
 

include/cef_keyboard_handler.h

@@ -46,7 +46,7 @@
 // methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefKeyboardHandler : public virtual CefBase {
+class CefKeyboardHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called before a keyboard event is sent to the renderer. |event| contains

include/cef_life_span_handler.h

@@ -49,7 +49,7 @@ class CefClient;
 // indicated.
 ///
 /*--cef(source=client)--*/
-class CefLifeSpanHandler : public virtual CefBase {
+class CefLifeSpanHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_window_open_disposition_t WindowOpenDisposition;
 

include/cef_load_handler.h

@@ -48,7 +48,7 @@
 // render process main thread (TID_RENDERER).
 ///
 /*--cef(source=client)--*/
-class CefLoadHandler : public virtual CefBase {
+class CefLoadHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_errorcode_t ErrorCode;
   typedef cef_transition_type_t TransitionType;

include/cef_menu_model.h

@@ -48,7 +48,7 @@
 // this class can only be accessed on the browser process the UI thread.
 ///
 /*--cef(source=library)--*/
-class CefMenuModel : public virtual CefBase {
+class CefMenuModel : public virtual CefBaseRefCounted {
  public:
   typedef cef_menu_item_type_t MenuItemType;
 

include/cef_menu_model_delegate.h

@@ -48,7 +48,7 @@ class CefMenuModel;
 // indicated.
 ///
 /*--cef(source=client)--*/
-class CefMenuModelDelegate : public virtual CefBase {
+class CefMenuModelDelegate : public virtual CefBaseRefCounted {
  public:
   ///
   // Perform the action associated with the specified |command_id| and

include/cef_navigation_entry.h

@@ -45,7 +45,7 @@
 // Class used to represent an entry in navigation history.
 ///
 /*--cef(source=library)--*/
-class CefNavigationEntry : public virtual CefBase {
+class CefNavigationEntry : public virtual CefBaseRefCounted {
  public:
   typedef cef_transition_type_t TransitionType;
 

include/cef_print_handler.h

@@ -46,7 +46,7 @@
 // Callback interface for asynchronous continuation of print dialog requests.
 ///
 /*--cef(source=library)--*/
-class CefPrintDialogCallback : public virtual CefBase {
+class CefPrintDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue printing with the specified |settings|.
@@ -65,7 +65,7 @@ class CefPrintDialogCallback : public virtual CefBase {
 // Callback interface for asynchronous continuation of print job requests.
 ///
 /*--cef(source=library)--*/
-class CefPrintJobCallback : public virtual CefBase {
+class CefPrintJobCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Indicate completion of the print job.
@@ -80,7 +80,7 @@ class CefPrintJobCallback : public virtual CefBase {
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefPrintHandler : public virtual CefBase {
+class CefPrintHandler : public virtual CefBaseRefCounted {
  public:
   ///
   // Called when printing has started for the specified |browser|. This method

include/cef_print_settings.h

@@ -46,7 +46,7 @@
 // Class representing print settings.
 ///
 /*--cef(source=library)--*/
-class CefPrintSettings : public virtual CefBase {
+class CefPrintSettings : public virtual CefBaseRefCounted {
  public:
   typedef cef_color_model_t ColorModel;
   typedef cef_duplex_mode_t DuplexMode;

include/cef_process_message.h

@@ -47,7 +47,7 @@ typedef cef_process_id_t CefProcessId;
 // Class representing a message. Can be used on any process and thread.
 ///
 /*--cef(source=library)--*/
-class CefProcessMessage : public virtual CefBase {
+class CefProcessMessage : public virtual CefBaseRefCounted {
  public:
   ///
   // Create a new CefProcessMessage object with the specified name.

include/cef_render_handler.h

@@ -49,7 +49,7 @@
 // The methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefRenderHandler : public virtual CefBase {
+class CefRenderHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_cursor_type_t CursorType;
   typedef cef_drag_operations_mask_t DragOperation;