Moved WebDataService to ProfileKeyedService

chrome/browser/extensions/app_notify_channel_setup_unittest.cc

Index: chrome/browser/extensions/app_notify_channel_setup_unittest.cc
diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
index 6407243bc104655708af4f4c80d11d7107cdbfa5..dcfa45f80a9e39caaac7f67a2aa3bfd4904d4792 100644
--- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
+++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/app_notify_channel_ui.h"
 #include "chrome/browser/signin/token_service_factory.h"
@@ -172,6 +173,7 @@ class TestUI : public AppNotifyChannelUI {
 class AppNotifyChannelSetupTest : public testing::Test {
  public:
   AppNotifyChannelSetupTest() : ui_thread_(BrowserThread::UI, &message_loop_),
+                                db_thread_(BrowserThread::DB),
                                 ui_(new TestUI()) {
   }
 
@@ -233,9 +235,24 @@ class AppNotifyChannelSetupTest : public testing::Test {
     delegate_.ExpectWasCalled(expected_code, expected_error);
   }
 
+  virtual void SetUp() OVERRIDE {
+    db_thread_.Start();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    // 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();

[Ilya Sherman, 2012/04/17 21:32:15]

Why is this needed?  It's not clear to me what we're actually waiting on.

[GeorgeY, 2012/04/18 18:14:46]

Please read the comment - it basically forces all pending tasks on db thread to
complete

[Ilya Sherman, 2012/04/18 18:22:26]

So, could we just replace this with a call to MessageLoop::RunAllPending()?

More importantly, though: What are the pending tasks that we need to wait on,
and who's adding them into the mix?  How are you guaranteeing that there are no
more pending tasks added after we run all the currently pending tasks?

[GeorgeY, 2012/04/19 00:58:40]

Need to have access to db_thread_ MessageLoop.
WebDataService, when deleted from UI thread (main thread in test) schedules
actual closing of the DB on db thread.

+    db_thread_.Stop();
+  }
+
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread db_thread_;
   TestProfile profile_;
   TestDelegate delegate_;
   scoped_ptr<TestUI> ui_;