Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/browser/ui/intents/web_intents_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 16 matching lines @@
   virtual void SetUp() {
     db_thread_.Start();
     wds_ = new WebDataService();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     wds_->Init(temp_dir_.path());
 
     registry_.Initialize(wds_, NULL);
   }
 
   virtual void TearDown() {
-    if (wds_.get())
-      wds_->Shutdown();
-
+    wds_->ShutdownOnUIThread();
+    wds_ = NULL;
+    base::WaitableEvent done(false, false);
+    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+    done.Wait();
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
   }
 
   void LoadRegistry() {
     {
       webkit_glue::WebIntentServiceData service;
       service.service_url = GURL("http://www.google.com/share");
       service.action = ASCIIToUTF16("SHARE");
@@ skipping 153 matching lines @@
 
   WebIntentsTreeNode* node = intents_model.GetTreeNode("www.google.com");
   ASSERT_EQ(2, node->child_count());
   node = node->GetChild(1);
   ASSERT_EQ(WebIntentsTreeNode::TYPE_SERVICE, node->Type());
   ASSERT_EQ(WebIntentsTreeNode::TYPE_SERVICE, node->Type());
   ServiceTreeNode* snode = static_cast<ServiceTreeNode*>(node);
   EXPECT_EQ(ASCIIToUTF16("XEDIT"), snode->Action());
   EXPECT_EQ(ASCIIToUTF16("http://www.google.com/xedit"), snode->ServiceUrl());
 }