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

include/cef_sandbox_win.h

@@ -31,7 +31,7 @@
 #define CEF_INCLUDE_CEF_SANDBOX_WIN_H_
 #pragma once
 
-#include "include/cef_base.h"
+#include "include/base/cef_build.h"
 
 #if defined(OS_WIN)
 

include/wrapper/cef_resource_manager.h

@@ -159,18 +159,18 @@ class CefResourceManager :
 
     // The below methods are called on the browser process IO thread.
 
-    explicit Request(scoped_ptr<RequestState> state);
+    explicit Request(SCOPED_PTR(RequestState) state);
 
-    scoped_ptr<RequestState> SendRequest();
+    SCOPED_PTR(RequestState) SendRequest();
     bool HasState();
 
-    static void ContinueOnIOThread(scoped_ptr<RequestState> state,
+    static void ContinueOnIOThread(SCOPED_PTR(RequestState) state,
                                    CefRefPtr<CefResourceHandler> handler);
-    static void StopOnIOThread(scoped_ptr<RequestState> state);
+    static void StopOnIOThread(SCOPED_PTR(RequestState) state);
 
     // Will be non-NULL while the request is pending. Only accessed on the
     // browser process IO thread.
-    scoped_ptr<RequestState> state_;
+    SCOPED_PTR(RequestState) state_;
 
     // Params that stay with this request object. Safe to access on any thread.
     RequestParams params_;
@@ -343,10 +343,10 @@ class CefResourceManager :
 
   // Methods that manage request state between requests. Called on the browser
   // process IO thread.
-  bool SendRequest(scoped_ptr<RequestState> state);
-  void ContinueRequest(scoped_ptr<RequestState> state,
+  bool SendRequest(SCOPED_PTR(RequestState) state);
+  void ContinueRequest(SCOPED_PTR(RequestState) state,
                        CefRefPtr<CefResourceHandler> handler);
-  void StopRequest(scoped_ptr<RequestState> state);
+  void StopRequest(SCOPED_PTR(RequestState) state);
   bool IncrementProvider(RequestState* state);
   void DetachRequestFromProvider(RequestState* state);
   void GetNextValidProvider(ProviderEntryList::iterator& iterator);
@@ -365,7 +365,7 @@ class CefResourceManager :
   MimeTypeResolver mime_type_resolver_;
 
   // Must be the last member. Created and accessed on the IO thread.
-  scoped_ptr<base::WeakPtrFactory<CefResourceManager> > weak_ptr_factory_;
+  SCOPED_PTR(base::WeakPtrFactory<CefResourceManager>) weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CefResourceManager);
 };

include/wrapper/cef_stream_resource_handler.h

@@ -90,7 +90,7 @@ class CefStreamResourceHandler : public CefResourceHandler {
   bool read_on_file_thread_;
 
   class Buffer;
-  scoped_ptr<Buffer> buffer_;
+  SCOPED_PTR(Buffer) buffer_;
 #ifndef NDEBUG
   // Used in debug builds to verify that |buffer_| isn't being accessed on
   // multiple threads at the same time.