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

Add CefResourceManager class for mapping requests to data providers (issue #1640).

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-05-22 21:57:31 -04:00
parent d02f03a71a
commit b6e5310bce
13 changed files with 3037 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unittests/test_handler.cc
View File

@@ -274,9 +274,10 @@ void TestHandler::DestroyTest() {
ui_thread_helper_.reset(NULL);
}
void TestHandler::OnTestTimeout(int timeout_ms) {
void TestHandler::OnTestTimeout(int timeout_ms, bool treat_as_error) {
EXPECT_UI_THREAD();
EXPECT_TRUE(false) << "Test timed out after " << timeout_ms << "ms";
if (treat_as_error)
EXPECT_TRUE(false) << "Test timed out after " << timeout_ms << "ms";
DestroyTest();
}
@@ -322,21 +323,24 @@ void TestHandler::ClearResources() {
resource_map_.clear();
}
void TestHandler::SetTestTimeout(int timeout_ms) {
void TestHandler::SetTestTimeout(int timeout_ms, bool treat_as_error) {
if (!CefCurrentlyOn(TID_UI)) {
CefPostTask(TID_UI, base::Bind(&TestHandler::SetTestTimeout, this,
timeout_ms));
timeout_ms, treat_as_error));
return;
}
if (CefCommandLine::GetGlobalCommandLine()->HasSwitch("disable-test-timeout"))
if (treat_as_error &&
CefCommandLine::GetGlobalCommandLine()->HasSwitch(
"disable-test-timeout")) {
return;
}
// Use a weak reference to |this| via UIThreadHelper so that the TestHandler
// can be destroyed before the timeout expires.
GetUIThreadHelper()->PostDelayedTask(
base::Bind(&TestHandler::OnTestTimeout, base::Unretained(this),
timeout_ms),
timeout_ms, treat_as_error),
timeout_ms);
}