summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata/web_data_service_unittest.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 23:40:52 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 23:40:52 +0000
commitf12f7b760a595f1cfa2bbac81078b48ce613901d (patch)
tree01e1a45a277e64bde59557ca6e50fa87145197ec /chrome/browser/webdata/web_data_service_unittest.cc
parent81545760b52a29fbcc7a594b5b81fd1d7cdcf8ec (diff)
downloadchromium_src-f12f7b760a595f1cfa2bbac81078b48ce613901d.zip
chromium_src-f12f7b760a595f1cfa2bbac81078b48ce613901d.tar.gz
chromium_src-f12f7b760a595f1cfa2bbac81078b48ce613901d.tar.bz2
Revert 35339 - Change WDS to use the DB thread rather than its own thread.
This cleanup was requested by brettw and was started to make it easier for the sync service to post tasks to the WDS thread (now the DB thread). This simplifies the WDS a bit since it no longer has to manage its own thread, and can assume that the DB thread is running throughout its lifetime. One change in behavior that is significant is that previous to this change, the WDS worker thread would always be joined when Shutdown() was called from Profile::~Profile(). Now the Shutdown() method schedules a task that can extend the lifetime of the WDS past the lifetime of the Profile instance. Review URL: http://codereview.chromium.org/524003 TBR=skrul@chromium.org Review URL: http://codereview.chromium.org/521013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/web_data_service_unittest.cc')
-rw-r--r--chrome/browser/webdata/web_data_service_unittest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 7c92725..1e26539 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -71,12 +71,10 @@ class AutofillWebDataServiceConsumer: public WebDataServiceConsumer {
class WebDataServiceTest : public testing::Test {
public:
WebDataServiceTest()
- : ui_thread_(ChromeThread::UI, &message_loop_),
- db_thread_(ChromeThread::DB) {}
+ : ui_thread_(ChromeThread::UI, &message_loop_) {}
protected:
virtual void SetUp() {
- db_thread_.Start();
name1_ = ASCIIToUTF16("name1");
name2_ = ASCIIToUTF16("name2");
value1_ = ASCIIToUTF16("value1");
@@ -96,7 +94,6 @@ class WebDataServiceTest : public testing::Test {
wds_->Shutdown();
file_util::Delete(profile_dir_, true);
- db_thread_.Stop();
MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
MessageLoop::current()->Run();
}
@@ -113,7 +110,6 @@ class WebDataServiceTest : public testing::Test {
MessageLoopForUI message_loop_;
ChromeThread ui_thread_;
- ChromeThread db_thread_;
string16 name1_;
string16 name2_;
string16 value1_;