| Index: chrome/browser/password_manager/password_store_x_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/password_manager/password_store_x_unittest.cc (revision 107928)
|
| +++ chrome/browser/password_manager/password_store_x_unittest.cc (working copy)
|
| @@ -11,6 +11,7 @@
|
| #include "base/string_util.h"
|
| #include "base/stringprintf.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"
|
| @@ -21,7 +22,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_browser_process.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "content/public/browser/notification_details.h"
|
| @@ -359,7 +359,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.
|
| @@ -377,7 +377,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.
|
| @@ -422,7 +422,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.
|
| @@ -436,7 +436,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.
|
| @@ -479,7 +479,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.
|
| @@ -564,7 +564,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.
|
| @@ -586,7 +586,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[] = {
|
| @@ -605,7 +605,7 @@
|
|
|
| // Wait for PasswordStore to send the notification.
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
|
| - new SignalingTask(&done));
|
| + new base::SignalingTask(&done));
|
| done.Wait();
|
|
|
| // Public in PasswordStore, protected in PasswordStoreX.
|
| @@ -647,7 +647,7 @@
|
| // carry on with the test.
|
| WaitableEvent done(false, false);
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
|
| - new SignalingTask(&done));
|
| + new base::SignalingTask(&done));
|
| done.Wait();
|
|
|
| // Get the new size of the login DB file. We expect it to be larger.
|
| @@ -712,7 +712,7 @@
|
|
|
| // Wait for the login DB methods to execute on the DB thread.
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
|
| - new SignalingTask(&done));
|
| + new base::SignalingTask(&done));
|
| done.Wait();
|
|
|
| if (GetParam() == WORKING_BACKEND) {
|
| @@ -732,7 +732,7 @@
|
|
|
| // Wait for the login DB methods to execute on the DB thread.
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
|
| - new SignalingTask(&done));
|
| + new base::SignalingTask(&done));
|
| done.Wait();
|
|
|
| if (GetParam() == WORKING_BACKEND) {
|
|
|