Update to Chromium revision 2b3ae3b8 (#394939)

include/base/cef_lock.h

@@ -50,6 +50,7 @@
 #include "include/base/internal/cef_lock_impl.h"
 
 namespace base {
+namespace cef_internal {
 
 // A convenient wrapper for an OS specific critical section.  The only real
 // intelligence in this class is in debug mode for the support for the
@@ -113,7 +114,7 @@ class Lock {
 #endif  // NDEBUG
 
   // Platform specific underlying lock implementation.
-  cef_internal::LockImpl lock_;
+  LockImpl lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Lock);
 };
@@ -160,6 +161,15 @@ class AutoUnlock {
   DISALLOW_COPY_AND_ASSIGN(AutoUnlock);
 };
 
+}  // namespace cef_internal
+
+// Implement classes in the cef_internal namespace and then expose them to the
+// base namespace. This avoids conflicts with the base.lib implementation when
+// linking sandbox support on Windows.
+using cef_internal::Lock;
+using cef_internal::AutoLock;
+using cef_internal::AutoUnlock;
+
 }  // namespace base
 
 #endif  // !USING_CHROMIUM_INCLUDES

include/base/cef_macros.h

@@ -40,6 +40,7 @@
 #define MOVE_SCOPED_PTR(var) std::move(var)
 
 // Chromium uses std types.
+#define SCOPED_PTR(type) std::unique_ptr<type>
 #define DEFAULT_DELETER(type) std::default_delete<type>
 
 #else  // !USING_CHROMIUM_INCLUDES
@@ -54,6 +55,7 @@
 #define MOVE_SCOPED_PTR(var) var.Pass()
 
 // CEF uses base types.
+#define SCOPED_PTR(type) scoped_ptr<type>
 #define DEFAULT_DELETER(type) struct base::DefaultDeleter<type>
 
 #if !defined(arraysize)

include/base/cef_scoped_ptr.h

@@ -120,8 +120,7 @@
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
 #elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/scoped_ptr.h"
+// Do nothing when building CEF.
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be