Moved WebDataService to ProfileKeyedService

chrome/browser/tabs/tab_strip_model_unittest.cc

Index: chrome/browser/tabs/tab_strip_model_unittest.cc
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 178fe53bcf417aa5cecd89c058ce2298b931f894..8ea1149e5c14a10b7ee24780e9f0c4bccb27db5a 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -16,6 +16,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
@@ -131,7 +132,20 @@ class TabStripDummyDelegate : public TestTabStripModelDelegate {
 
 class TabStripModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  TabStripModelTest() : browser_thread_(BrowserThread::UI, &message_loop_) {
+  TabStripModelTest()
+      : browser_thread_(BrowserThread::UI, &message_loop_),

[sky, 2012/04/17 20:45:51]

Promote this code to either ChromeRenderViewHostTestHarness , or a new
superclass that takes care of it.

[GeorgeY, 2012/04/17 20:52:25]

Done already - forgot about this test - it is reverted now

+        db_thread_(BrowserThread::DB) {
+    db_thread_.Start();
+  }
+
+  ~TabStripModelTest() {
+    // Schedule another task on the DB thread to notify us that it's safe to
+    // carry on with the test.
+    base::WaitableEvent done(false, false);
+    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+    done.Wait();
+    db_thread_.Stop();
   }
 
   TabContentsWrapper* CreateTabContents() {
@@ -245,6 +259,7 @@ class TabStripModelTest : public ChromeRenderViewHostTestHarness {
   }
 
   content::TestBrowserThread browser_thread_;
+  content::TestBrowserThread db_thread_;
 
   std::wstring test_dir_;
   std::wstring profile_path_;