bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add current thread expectations to content_filter_unittest.cc 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@245 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-05-25 16:57:28 +00:00
parent 387b24e382
commit 81b0a9a362
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unittests/content_filter_unittest.cc
View File

@ -25,6 +25,8 @@ public:
CefRefPtr<CefStreamReader>& substitute_data) CefRefPtr<CefStreamReader>& substitute_data)
OVERRIDE OVERRIDE
{ {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
g_ContentFilterProcessDataCalled = true; g_ContentFilterProcessDataCalled = true;
std::string in_out((char*)data, data_size); std::string in_out((char*)data, data_size);
@ -94,6 +96,8 @@ public:
virtual void Drain(CefRefPtr<CefStreamReader>& remainder) OVERRIDE virtual void Drain(CefRefPtr<CefStreamReader>& remainder) OVERRIDE
{ {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
g_ContentFilterDrainCalled = true; g_ContentFilterDrainCalled = true;
if (remainder_.empty()) if (remainder_.empty())
@ -133,6 +137,8 @@ public:
virtual void Visit(CefRefPtr<CefDOMDocument> document) OVERRIDE virtual void Visit(CefRefPtr<CefDOMDocument> document) OVERRIDE
{ {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
handler_->got_visitor_called_.yes(); handler_->got_visitor_called_.yes();
TestContentReplaced(document); TestContentReplaced(document);
@ -165,6 +171,8 @@ public:
CefRefPtr<CefResponse> response, CefRefPtr<CefResponse> response,
CefRefPtr<CefContentFilter>& filter) OVERRIDE CefRefPtr<CefContentFilter>& filter) OVERRIDE
{ {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
g_ContentFilterTestHandlerHandleResourceResponseCalled = true; g_ContentFilterTestHandlerHandleResourceResponseCalled = true;
ASSERT_EQ(url, "http://tests/test_filter.html"); ASSERT_EQ(url, "http://tests/test_filter.html");
@ -187,6 +195,8 @@ public:
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
int httpStatusCode) OVERRIDE int httpStatusCode) OVERRIDE
{ {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
if(frame->IsMain()) { if(frame->IsMain()) {
// The page is done loading so visit the DOM. // The page is done loading so visit the DOM.
browser->GetMainFrame()->VisitDOM(visitor_.get()); browser->GetMainFrame()->VisitDOM(visitor_.get());