OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/platform_file.h" | 9 #include "base/platform_file.h" |
10 #include "base/scoped_temp_dir.h" | 10 #include "base/scoped_temp_dir.h" |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 | 291 |
292 login_db_.reset(new LoginDatabase()); | 292 login_db_.reset(new LoginDatabase()); |
293 ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append("login_test"))); | 293 ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append("login_test"))); |
294 | 294 |
295 wds_ = new WebDataService(); | 295 wds_ = new WebDataService(); |
296 ASSERT_TRUE(wds_->Init(temp_dir_.path())); | 296 ASSERT_TRUE(wds_->Init(temp_dir_.path())); |
297 } | 297 } |
298 | 298 |
299 virtual void TearDown() { | 299 virtual void TearDown() { |
300 wds_->Shutdown(); | 300 wds_->Shutdown(); |
301 MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); | 301 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
302 MessageLoop::current()->Run(); | 302 MessageLoop::current()->Run(); |
303 db_thread_.Stop(); | 303 db_thread_.Stop(); |
304 } | 304 } |
305 | 305 |
306 PasswordStoreX::NativeBackend* GetBackend() { | 306 PasswordStoreX::NativeBackend* GetBackend() { |
307 switch (GetParam()) { | 307 switch (GetParam()) { |
308 case FAILING_BACKEND: | 308 case FAILING_BACKEND: |
309 return new FailingBackend(); | 309 return new FailingBackend(); |
310 case WORKING_BACKEND: | 310 case WORKING_BACKEND: |
311 return new MockBackend(); | 311 return new MockBackend(); |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
756 | 756 |
757 INSTANTIATE_TEST_CASE_P(NoBackend, | 757 INSTANTIATE_TEST_CASE_P(NoBackend, |
758 PasswordStoreXTest, | 758 PasswordStoreXTest, |
759 testing::Values(NO_BACKEND)); | 759 testing::Values(NO_BACKEND)); |
760 INSTANTIATE_TEST_CASE_P(FailingBackend, | 760 INSTANTIATE_TEST_CASE_P(FailingBackend, |
761 PasswordStoreXTest, | 761 PasswordStoreXTest, |
762 testing::Values(FAILING_BACKEND)); | 762 testing::Values(FAILING_BACKEND)); |
763 INSTANTIATE_TEST_CASE_P(WorkingBackend, | 763 INSTANTIATE_TEST_CASE_P(WorkingBackend, |
764 PasswordStoreXTest, | 764 PasswordStoreXTest, |
765 testing::Values(WORKING_BACKEND)); | 765 testing::Values(WORKING_BACKEND)); |
OLD | NEW |