Update to Chromium revision 0bfd25d4 (#381305)

- Delete include/cef_runnable.h (issue #1336).
- Build the cef_unittests target using all Chromium headers. Add a
  USING_CHROMIUM_INCLUDES define and libcef_dll_wrapper_unittests
  target to support this. This change avoids compile errors due to
  the divergence of CEF and Chromium base/ header implementations.
  The libcef_dll_wrapper sources must now compile successfully with
  both CEF and Chromium base/ headers (issue #1632).
- The onbeforeunload message specified via JavaScript is no longer
  passed to the client (see http://crbug.com/587940).

tests/unittests/browser_info_map_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <list>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "libcef_dll/wrapper/cef_browser_info_map.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/chromium_includes.h

@@ -1,14 +0,0 @@
-// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-
-#ifndef CEF_TESTS_UNITTESTS_CHROMIUM_INCLUDES_H_
-#define CEF_TESTS_UNITTESTS_CHROMIUM_INCLUDES_H_
-#pragma once
-
-// Include some Chromium headers first to avoid type conflicts with CEF headers.
-#include "base/bind.h"
-#include "base/strings/string16.h"
-#include "base/synchronization/lock.h"
-
-#endif  // CEF_TESTS_UNITTESTS_CHROMIUM_INCLUDES_H_

tests/unittests/command_line_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_command_line.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/cookie_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <vector>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/files/scoped_temp_dir.h"
 #include "base/synchronization/waitable_event.h"
 

tests/unittests/dialog_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"

tests/unittests/display_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <list>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"

tests/unittests/dom_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_dom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tests/cefclient/renderer/client_app_renderer.h"

tests/unittests/download_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 

tests/unittests/draggable_regions_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tests/unittests/test_handler.h"

tests/unittests/frame_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/base/cef_scoped_ptr.h"
 #include "include/wrapper/cef_closure_task.h"

tests/unittests/geolocation_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/synchronization/waitable_event.h"
 
 #include "include/base/cef_bind.h"

tests/unittests/jsdialog_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -145,7 +142,10 @@ class JSDialogTestHandler : public TestHandler {
     got_onbeforeunloaddialog_.yes();
 
     if (type_ == TYPE_ONBEFOREUNLOAD) {
-      EXPECT_STREQ("My unload message", message_text.ToString().c_str());
+      // The message is no longer configurable via JavaScript.
+      // See http://crbug.com/587940.
+      EXPECT_STREQ("Is it OK to leave/reload this page?",
+                   message_text.ToString().c_str());
       EXPECT_FALSE(is_reload);
     }
 

tests/unittests/life_span_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -101,7 +98,12 @@ class LifeSpanTestHandler : public RoutingTestHandler {
     }
 
     EXPECT_TRUE(browser->IsSame(GetBrowser()));
-    EXPECT_STREQ(kUnloadDialogText, message_text.ToString().c_str());
+
+    // The message is no longer configurable via JavaScript.
+    // See http://crbug.com/587940.
+    EXPECT_STREQ("Is it OK to leave/reload this page?",
+                 message_text.ToString().c_str());
+
     EXPECT_FALSE(is_reload);
     EXPECT_TRUE(callback.get());
 

tests/unittests/message_router_unittest.cc

@@ -6,9 +6,6 @@
 #include <set>
 #include <vector>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/strings/stringprintf.h"
 
 #include "include/base/cef_bind.h"

tests/unittests/navigation_unittest.cc

@@ -5,9 +5,6 @@
 #include <algorithm>
 #include <list>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_callback.h"
 #include "include/cef_scheme.h"
@@ -2049,6 +2046,7 @@ class PopupNavTestHandler : public TestHandler {
                      CefRefPtr<CefClient>& client,
                      CefBrowserSettings& settings,
                      bool* no_javascript_access) override {
+    EXPECT_FALSE(got_on_before_popup_);
     got_on_before_popup_.yes();
 
     EXPECT_TRUE(CefCurrentlyOn(TID_IO));
@@ -2066,15 +2064,35 @@ class PopupNavTestHandler : public TestHandler {
   void OnAfterCreated(CefRefPtr<CefBrowser> browser) override {
     TestHandler::OnAfterCreated(browser);
 
-    if (mode_ == NAVIGATE_AFTER_CREATION && browser->IsPopup())
+    if (mode_ == NAVIGATE_AFTER_CREATION && browser->IsPopup()) {
+      // Navigate to the 2nd popup URL instead of the 1st popup URL.
       browser->GetMainFrame()->LoadURL(kPopupNavPopupUrl2);
+    }
+  }
+
+  void OnLoadStart(CefRefPtr<CefBrowser> browser,
+                   CefRefPtr<CefFrame> frame) override {
+    const std::string& url = frame->GetURL();
+    if (url == kPopupNavPageUrl) {
+      EXPECT_FALSE(got_load_start_);
+      got_load_start_.yes();
+    } else if (url == kPopupNavPopupUrl) {
+      EXPECT_FALSE(got_popup_load_start_);
+      got_popup_load_start_.yes();
+    } else if (url == kPopupNavPopupUrl2) {
+      EXPECT_FALSE(got_popup_load_start2_);
+      got_popup_load_start2_.yes();
+    }
   }
 
   void OnLoadEnd(CefRefPtr<CefBrowser> browser,
                  CefRefPtr<CefFrame> frame,
                  int httpStatusCode) override {
-    std::string url = frame->GetURL();
+    const std::string& url = frame->GetURL();
     if (url == kPopupNavPageUrl) {
+      EXPECT_FALSE(got_load_end_);
+      got_load_end_.yes();
+
       frame->ExecuteJavaScript("doPopup()", kPopupNavPageUrl, 0);
 
       if (mode_ == DENY) {
@@ -2083,9 +2101,11 @@ class PopupNavTestHandler : public TestHandler {
             base::Bind(&PopupNavTestHandler::DestroyTest, this), 200);
       }
     } else if (url == kPopupNavPopupUrl) {
+      EXPECT_FALSE(got_popup_load_end_);
+      got_popup_load_end_.yes();
+
       if (mode_ != NAVIGATE_AFTER_CREATION) {
         if (mode_ != DENY) {
-          got_popup_load_end_.yes();
           browser->GetHost()->CloseBrowser(false);
           DestroyTest();
         } else {
@@ -2093,8 +2113,10 @@ class PopupNavTestHandler : public TestHandler {
         }
       }
     } else if (url == kPopupNavPopupUrl2) {
+      EXPECT_FALSE(got_popup_load_end2_);
+      got_popup_load_end2_.yes();
+
       if (mode_ == NAVIGATE_AFTER_CREATION) {
-        got_popup_load_end_.yes();
         browser->GetHost()->CloseBrowser(false);
         DestroyTest();
       } else {
@@ -2107,11 +2129,25 @@ class PopupNavTestHandler : public TestHandler {
 
  private:
   void DestroyTest() override {
+    EXPECT_TRUE(got_load_start_);
+    EXPECT_TRUE(got_load_end_);
     EXPECT_TRUE(got_on_before_popup_);
-    if (mode_ != DENY)
+    if (mode_ == ALLOW) {
+      EXPECT_TRUE(got_popup_load_start_);
       EXPECT_TRUE(got_popup_load_end_);
-    else
+      EXPECT_FALSE(got_popup_load_start2_);
+      EXPECT_FALSE(got_popup_load_end2_);
+    } else if (mode_ == DENY) {
+      EXPECT_FALSE(got_popup_load_start_);
       EXPECT_FALSE(got_popup_load_end_);
+      EXPECT_FALSE(got_popup_load_start2_);
+      EXPECT_FALSE(got_popup_load_end2_);
+    } else if (mode_ == NAVIGATE_AFTER_CREATION) {
+      EXPECT_FALSE(got_popup_load_start_);
+      EXPECT_FALSE(got_popup_load_end_);
+      EXPECT_TRUE(got_popup_load_start2_);
+      EXPECT_TRUE(got_popup_load_end2_);
+    }
 
     TestHandler::DestroyTest();
   }
@@ -2119,7 +2155,12 @@ class PopupNavTestHandler : public TestHandler {
   const Mode mode_;
 
   TrackCallback got_on_before_popup_;
+  TrackCallback got_load_start_;
+  TrackCallback got_load_end_;
+  TrackCallback got_popup_load_start_;
   TrackCallback got_popup_load_end_;
+  TrackCallback got_popup_load_start2_;
+  TrackCallback got_popup_load_end2_;
 
   IMPLEMENT_REFCOUNTING(PopupNavTestHandler);
 };

tests/unittests/os_rendering_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/geometry/dip_util.h"

tests/unittests/os_rendering_unittest_mac.mm

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license
 // that can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #import <AppKit/AppKit.h>
 #import <Cocoa/Cocoa.h>
 

tests/unittests/parser_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -299,7 +296,8 @@ TEST(ParserTest, URIDecode) {
   const CefString& decoded_value =
       CefURIDecode(test_str_encoded, false,
                    static_cast<cef_uri_unescape_rule_t>(
-                      UU_SPACES | UU_URL_SPECIAL_CHARS));
+                       UU_SPACES |
+                       UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS));
   EXPECT_STREQ(test_str_decoded.c_str(), decoded_value.ToString().c_str());
 }
 

tests/unittests/plugin_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_pack_resources.h"
 #include "include/cef_resource_bundle.h"

tests/unittests/preference_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/synchronization/waitable_event.h"
 
 #include "include/base/cef_bind.h"

tests/unittests/print_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <algorithm>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_print_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/process_message_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_process_message.h"
 #include "include/cef_task.h"
 #include "testing/gtest/include/gtest/gtest.h"

tests/unittests/request_context_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "include/cef_request_context.h"

tests/unittests/request_handler_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include <algorithm>
 #include <string>
 

tests/unittests/request_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <map>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_request.h"
 #include "include/wrapper/cef_closure_task.h"

tests/unittests/resource_manager_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include <vector>
 
 #include "base/files/file_util.h"

tests/unittests/routing_test_handler.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "tests/unittests/routing_test_handler.h"
 #include "tests/cefclient/renderer/client_app_renderer.h"
 

tests/unittests/run_all_unittests.cc

@@ -2,8 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
+#include "include/base/cef_build.h"
 
 #if defined(OS_LINUX)
 #include <X11/Xlib.h>

tests/unittests/run_all_unittests_mac.mm

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_app.h"
 #import "include/cef_application_mac.h"
 

tests/unittests/scheme_handler_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <algorithm>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_origin_whitelist.h"
 #include "include/cef_callback.h"

tests/unittests/stream_resource_handler_unittest.cc

@@ -6,9 +6,6 @@
 #include <cstdlib>
 #include <string>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_stream.h"
 #include "include/wrapper/cef_closure_task.h"

tests/unittests/stream_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <algorithm>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/string_unittest.cc

@@ -5,9 +5,6 @@
 #include <map>
 #include <vector>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_string16.h"
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_string_list.h"

tests/unittests/task_unittest.cc

@@ -2,11 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
-#include "include/cef_runnable.h"
+#include "include/base/cef_bind.h"
 #include "include/cef_task.h"
+#include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tests/unittests/test_handler.h"
 
@@ -101,7 +99,8 @@ void PostTask1(bool* ran_test) {
   EXPECT_TRUE(runner->BelongsToThread(TID_IO));
   
   bool got_it = false;
-  runner->PostTask(NewCefRunnableFunction(&PostTaskEvent1, &got_it, runner));
+  runner->PostTask(
+      CefCreateClosureTask(base::Bind(&PostTaskEvent1, &got_it, runner)));
 
   WaitForThread(runner);
   EXPECT_TRUE(got_it);
@@ -118,7 +117,7 @@ void PostDelayedTask1(bool* ran_test) {
   
   bool got_it = false;
   runner->PostDelayedTask(
-      NewCefRunnableFunction(&PostTaskEvent1, &got_it, runner), 0);
+      CefCreateClosureTask(base::Bind(&PostTaskEvent1, &got_it, runner)), 0);
 
   WaitForThread(runner);
   EXPECT_TRUE(got_it);
@@ -138,7 +137,8 @@ void PostTask2(bool* ran_test) {
   EXPECT_FALSE(CefCurrentlyOn(TID_IO));
 
   bool got_it = false;
-  CefPostTask(TID_IO, NewCefRunnableFunction(&PostTaskEvent2, &got_it));
+  CefPostTask(TID_IO,
+      CefCreateClosureTask(base::Bind(&PostTaskEvent2, &got_it)));
 
   WaitForThread(TID_IO);
   EXPECT_TRUE(got_it);
@@ -152,7 +152,7 @@ void PostDelayedTask2(bool* ran_test) {
 
   bool got_it = false;
   CefPostDelayedTask(TID_IO,
-      NewCefRunnableFunction(&PostTaskEvent2, &got_it), 0);
+      CefCreateClosureTask(base::Bind(&PostTaskEvent2, &got_it)), 0);
 
   WaitForThread(TID_IO);
   EXPECT_TRUE(got_it);
@@ -164,42 +164,46 @@ void PostDelayedTask2(bool* ran_test) {
 
 TEST(TaskTest, GetForCurrentThread) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&GetForCurrentThread, &ran_test));
+  CefPostTask(TID_UI,
+      CefCreateClosureTask(base::Bind(&GetForCurrentThread, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }
 
 TEST(TaskTest, GetForThread) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&GetForThread, &ran_test));
+  CefPostTask(TID_UI,
+      CefCreateClosureTask(base::Bind(&GetForThread, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }
 
 TEST(TaskTest, PostTask1) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&PostTask1, &ran_test));
+  CefPostTask(TID_UI, CefCreateClosureTask(base::Bind(&PostTask1, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }
 
 TEST(TaskTest, PostDelayedTask1) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&PostDelayedTask1, &ran_test));
+  CefPostTask(TID_UI,
+      CefCreateClosureTask(base::Bind(&PostDelayedTask1, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }
 
 TEST(TaskTest, PostTask2) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&PostTask2, &ran_test));
+  CefPostTask(TID_UI, CefCreateClosureTask(base::Bind(&PostTask2, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }
 
 TEST(TaskTest, PostDelayedTask2) {
   bool ran_test = false;
-  CefPostTask(TID_UI, NewCefRunnableFunction(&PostDelayedTask2, &ran_test));
+  CefPostTask(TID_UI,
+      CefCreateClosureTask(base::Bind(&PostDelayedTask2, &ran_test)));
   WaitForThread(TID_UI);
   EXPECT_TRUE(ran_test);
 }

tests/unittests/test_handler.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "tests/unittests/test_handler.h"
 
 #include "include/base/cef_bind.h"

tests/unittests/test_handler.h

@@ -13,6 +13,7 @@
 
 #include "base/synchronization/waitable_event.h"
 
+#include "include/base/cef_bind.h"
 #include "include/cef_browser.h"
 #include "include/cef_client.h"
 #include "include/cef_frame.h"

tests/unittests/test_suite.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "tests/unittests/test_suite.h"
 
 #include "base/command_line.h"

tests/unittests/test_util.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "tests/unittests/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/tracing_unittest.cc

@@ -2,20 +2,20 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/files/file_util.h"
 #include "base/synchronization/waitable_event.h"
 
 #include "include/base/cef_bind.h"
-#include "include/base/cef_trace_event.h"
 #include "include/cef_task.h"
 #include "include/cef_trace.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tests/unittests/test_handler.h"
 
+// Use the CEF version of the TRACE_* macros instead of the Chromium version.
+#undef USING_CHROMIUM_INCLUDES
+#include "include/base/cef_trace_event.h"
+
 enum TracingTestType {
   TT_TRACE_EVENT0,
   TT_TRACE_EVENT1,

tests/unittests/translator_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/test/cef_translator_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/urlrequest_unittest.cc

@@ -5,9 +5,6 @@
 #include <map>
 #include <sstream>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/stringprintf.h"

tests/unittests/v8_unittest.cc

@@ -4,9 +4,6 @@
 
 #include <sstream>
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/base/cef_bind.h"
 #include "include/cef_task.h"
 #include "include/cef_v8.h"

tests/unittests/values_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_task.h"
 #include "include/cef_values.h"
 #include "testing/gtest/include/gtest/gtest.h"

tests/unittests/version_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

tests/unittests/xml_reader_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_stream.h"
 #include "include/cef_xml_reader.h"
 #include "include/wrapper/cef_xml_object.h"

tests/unittests/zip_reader_unittest.cc

@@ -2,9 +2,6 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-// Include this first to avoid type conflicts with CEF headers.
-#include "tests/unittests/chromium_includes.h"
-
 #include "include/cef_stream.h"
 #include "include/cef_zip_reader.h"
 #include "include/wrapper/cef_zip_archive.h"