@@ -588,8 +588,6 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
     else:
         # multi_threaded_message_loop_windows overrides multi_threaded_message_loop
         application_settings["multi_threaded_message_loop"] = application_settings["multi_threaded_message_loop_windows"]
-    if not "single_process" in application_settings:
-        application_settings["single_process"] = False
     # ------------------------------------------------------------------------
 
     # ------------------------------------------------------------------------
 
@@ -13,11 +13,11 @@ bool RenderHandler::GetRootScreenRect(CefRefPtr<CefBrowser> browser,
 }
 
 
-bool RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,
+void RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,
                                 CefRect& rect)
 {
     REQUIRE_UI_THREAD();
-    return RenderHandler_GetViewRect(browser, rect);
+    RenderHandler_GetViewRect(browser, rect);
 }
 
 
 
@@ -22,7 +22,7 @@ class RenderHandler : public CefRenderHandler,
     bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
                            CefRect& rect) override;
 
-    bool GetViewRect(CefRefPtr<CefBrowser> browser,
+    void GetViewRect(CefRefPtr<CefBrowser> browser,
                      CefRect& rect) override;
 
     bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
 
@@ -34,7 +34,6 @@ cdef extern from "include/internal/cef_types.h":
 
     ctypedef struct CefSettings:
         cef_string_t accept_language_list
-        int single_process
         cef_string_t browser_subprocess_path
         int command_line_args_disabled
         cef_string_t cache_path
 
@@ -51,7 +51,7 @@ cdef public cpp_bool RenderHandler_GetRootScreenRect(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
-cdef public cpp_bool RenderHandler_GetViewRect(
+cdef public void RenderHandler_GetViewRect(
         CefRefPtr[CefBrowser] cefBrowser,
         CefRect& cefRect
         ) except * with gil:
@@ -69,11 +69,6 @@ cdef public cpp_bool RenderHandler_GetViewRect(
                 cefRect.y = pyRect[1]
                 cefRect.width = pyRect[2]
                 cefRect.height = pyRect[3]
-                return True
-            else:
-                return False
-        else:
-            return False
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
@@ -162,6 +162,16 @@
 #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
 #endif
 
+// Sanitizers annotations.
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
+#endif
+#endif
+#if !defined(NO_SANITIZE)
+#define NO_SANITIZE(what)
+#endif
+
 #endif  // !USING_CHROMIUM_INCLUDES
 
 // Annotate a virtual method indicating it must be overriding a virtual method
 
@@ -51,7 +51,7 @@
 #include "include/base/cef_atomic_ref_count.h"
 #include "include/base/cef_build.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_thread_collision_warner.h"
+#include "include/base/cef_macros.h"
 
 namespace base {
 
@@ -60,6 +60,7 @@ namespace cef_subtle {
 class RefCountedBase {
  public:
   bool HasOneRef() const { return ref_count_ == 1; }
+  bool HasAtLeastOneRef() const { return ref_count_ >= 1; }
 
  protected:
   RefCountedBase()
@@ -78,10 +79,6 @@ class RefCountedBase {
   }
 
   void AddRef() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
 #endif
@@ -90,10 +87,6 @@ class RefCountedBase {
 
   // Returns true if the object should self-delete.
   bool Release() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
 #endif
@@ -112,14 +105,13 @@ class RefCountedBase {
   mutable bool in_dtor_;
 #endif
 
-  DFAKE_MUTEX(add_release_);
-
   DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
 };
 
 class RefCountedThreadSafeBase {
  public:
   bool HasOneRef() const;
+  bool HasAtLeastOneRef() const;
 
  protected:
   RefCountedThreadSafeBase();
 
@@ -86,6 +86,7 @@ typedef std::char_traits<wchar_t> string16_char_traits;
 
 #include "include/base/cef_macros.h"
 
+namespace cef {
 namespace base {
 
 typedef uint16_t char16;
@@ -156,7 +157,15 @@ struct string16_char_traits {
   static int_type eof() { return static_cast<int_type>(EOF); }
 };
 
-typedef std::basic_string<char16, base::string16_char_traits> string16;
+typedef std::basic_string<char16, string16_char_traits> string16;
+
+}  // namespace base
+}  // namespace cef
+
+namespace base {
+
+typedef cef::base::char16 char16;
+typedef cef::base::string16 string16;
 
 extern std::ostream& operator<<(std::ostream& out, const string16& str);
 
@@ -204,8 +213,8 @@ extern void PrintTo(const string16& str, std::ostream* out);
 //
 // TODO(mark): File this bug with Apple and update this note with a bug number.
 
-extern template class std::basic_string<base::char16,
-                                        base::string16_char_traits>;
+extern template class std::basic_string<cef::base::char16,
+                                        cef::base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ bool RenderHandler::GetRootScreenRect(CefRefPtr<CefBrowser> browser,`
`13`	`13`	`}`
`14`	`14`
`15`	`15`
`16`		`-bool RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,`
	`16`	`+void RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,`
`17`	`17`	`CefRect& rect)`
`18`	`18`	`{`
`19`	`19`	`REQUIRE_UI_THREAD();`
`20`		`- return RenderHandler_GetViewRect(browser, rect);`
	`20`	`+ RenderHandler_GetViewRect(browser, rect);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`