bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduce the use of Chromium types (issue #1336).

Browse Source 
Changes to the CEF public API:
- Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types.
- Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask.
- Change CefRefPtr to extend scoped_refptr.
-- Change CefBase method signatures to match RefCountedThreadSafeBase.
- Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*.
-- Remove the CefAtomic* functions.
-- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro.
- Change IMPLEMENT_LOCKING to use base::Lock.
-- Remove the CefCriticalSection class.
-- Deprecate the IMPLEMENT_LOCKING macro.
-- base::Lock will DCHECK() in Debug builds if lock usage is reentrant.
- Move include/internal/cef_tuple.h to include/base/cef_tuple.h.
- Allow an empty |callback| parameter passed to CefBeginTracing.

Changes to the CEF implementation:
- Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro.
- Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations.
- Remove use of the IMPLEMENT_LOCKING macro.

Changes to cef_unittests:
- Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types.
- Fix wrong header include ordering.
- Remove use of the IMPLEMENT_LOCKING macro.

Changes to cefclient and cefsimple:
- Use base::Bind and cef_closure_task.h instead of NewCefRunnable*.
- Remove use of the IMPEMENT_LOCKING macro.
- Fix incorrect/unnecessary locking.
- Add additional runtime thread checks.
- Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-07-14 22:18:51 +00:00
parent c260a2d166
commit 122397acfc
314 changed files with 13077 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/unittests/urlrequest_unittest.cc
View File

@@ -5,20 +5,22 @@
#include <map>
#include <sstream>
#include "include/cef_scheme.h"
#include "include/cef_task.h"
#include "include/cef_urlrequest.h"
#include "tests/cefclient/client_app.h"
#include "tests/unittests/test_handler.h"
#include "tests/unittests/test_util.h"
// Include this first to avoid type conflicts with CEF headers.
#include "tests/unittests/chromium_includes.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "include/base/cef_bind.h"
#include "include/cef_scheme.h"
#include "include/cef_task.h"
#include "include/cef_urlrequest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "tests/cefclient/client_app.h"
#include "tests/unittests/test_handler.h"
#include "tests/unittests/test_util.h"
// Include after base/bind.h to avoid name collisions with cef_tuple.h.
#include "include/cef_runnable.h"
@@ -286,7 +288,7 @@ class RequestSchemeHandler : public CefResourceHandler {
RequestRunSettings settings_;
size_t offset_;
IMPLEMENT_REFCOUNTING(ClientSchemeHandler);
IMPLEMENT_REFCOUNTING(RequestSchemeHandler);
};
// Serves redirect request responses.
@@ -343,7 +345,7 @@ class RequestRedirectSchemeHandler : public CefResourceHandler {
CefRefPtr<CefRequest> request_;
CefRefPtr<CefResponse> response_;
IMPLEMENT_REFCOUNTING(ClientSchemeHandler);
IMPLEMENT_REFCOUNTING(RequestRedirectSchemeHandler);
};
@@ -410,7 +412,7 @@ class RequestSchemeHandlerFactory : public CefSchemeHandlerFactory {
RedirectHandlerMap;
RedirectHandlerMap redirect_handler_map_;
IMPLEMENT_REFCOUNTING(ClientSchemeHandlerFactory);
IMPLEMENT_REFCOUNTING(RequestSchemeHandlerFactory);
};
@@ -897,7 +899,7 @@ class RequestRendererTest : public ClientApp::RenderDelegate,
RequestTestRunner test_runner_;
IMPLEMENT_REFCOUNTING(SendRecvRendererTest);
IMPLEMENT_REFCOUNTING(RequestRendererTest);
};
// Browser side.
@@ -1178,5 +1180,5 @@ TEST(URLRequestTest, BrowserInvalidURL) {
client->RunTest();
// Verify that there's only one reference to the client.
EXPECT_EQ(1, client->GetRefCt());
EXPECT_TRUE(client->HasOneRef());
}