Index: chrome/browser/password_manager/password_store_default_unittest.cc |
=================================================================== |
--- chrome/browser/password_manager/password_store_default_unittest.cc (revision 107928) |
+++ chrome/browser/password_manager/password_store_default_unittest.cc (working copy) |
@@ -7,6 +7,7 @@ |
#include "base/stl_util.h" |
#include "base/string_util.h" |
#include "base/synchronization/waitable_event.h" |
+#include "base/test/signaling_task.h" |
#include "base/time.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/password_manager/password_form_data.h" |
@@ -17,7 +18,6 @@ |
#include "chrome/browser/webdata/web_data_service.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/signaling_task.h" |
#include "chrome/test/base/testing_profile.h" |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -190,7 +190,7 @@ |
// yet another task to notify us that it's safe to carry on with the test. |
WaitableEvent done(false, false); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
MockPasswordStoreConsumer consumer; |
@@ -285,7 +285,7 @@ |
// task to notify us that it's safe to carry on with the test. |
WaitableEvent done(false, false); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Initializing the PasswordStore should trigger a migration. |
@@ -301,7 +301,7 @@ |
// Again, the WDS schedules tasks to run on the DB thread, so schedule a task |
// to signal us when it is safe to continue. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Let the WDS callbacks proceed so the logins can be migrated. |
@@ -346,7 +346,7 @@ |
// Wait for the WDS methods to execute on the DB thread. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Handle the callback from the WDS. |
@@ -360,7 +360,7 @@ |
// Wait for the WDS methods to execute on the DB thread. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Handle the callback from the WDS. |
@@ -398,7 +398,7 @@ |
// task to notify us that it's safe to carry on with the test. |
WaitableEvent done(false, false); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Pretend that the migration has already taken place. |
@@ -478,7 +478,7 @@ |
// yet another task to notify us that it's safe to carry on with the test. |
WaitableEvent done(false, false); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
// Change the password. |
@@ -500,7 +500,7 @@ |
// Wait for PasswordStore to send the notification. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
const PasswordStoreChange expected_delete_changes[] = { |
@@ -519,7 +519,7 @@ |
// Wait for PasswordStore to send the notification. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- new SignalingTask(&done)); |
+ new base::SignalingTask(&done)); |
done.Wait(); |
store->Shutdown(); |