From 81b0a9a3629e1b30ee5de32272fe644f82bc0088 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 25 May 2011 16:57:28 +0000
Subject: [PATCH] Add current thread expectations to content_filter_unittest.cc

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@245 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 tests/unittests/content_filter_unittest.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

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