summaryrefslogtreecommitdiffstats
path: root/chrome/browser/supervised_user
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-04-29 02:59:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-29 10:00:09 +0000
commitf97a122208d5bd48d0200a83a585f005e8015353 (patch)
tree73bba76cd3d2a7f56fd683f5544f290148588f62 /chrome/browser/supervised_user
parente7d6799e93c88c89906f59d16b23711d24e04b29 (diff)
downloadchromium_src-f97a122208d5bd48d0200a83a585f005e8015353.zip
chromium_src-f97a122208d5bd48d0200a83a585f005e8015353.tar.gz
chromium_src-f97a122208d5bd48d0200a83a585f005e8015353.tar.bz2
Add task runners to more tests
This patch modifies a number of tests to have a more realistic threading set-up by either: a) adding a TestBrowserThreadBundle b) constructing any existing TestBrowserThreadBundle earlier or c) adding a MessageLoop as appropriate. This makes it possible to later migrate base/ from MessageLoopProxy over to ThreadTaskRunnerHandle, which requires an active task runner on the current thread. BUG=465354, 481632 TBR=tommi@chromium.org Review URL: https://codereview.chromium.org/1105373002 Cr-Commit-Position: refs/heads/master@{#327463}
Diffstat (limited to 'chrome/browser/supervised_user')
-rw-r--r--chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
index b379300..c267227 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
@@ -5,7 +5,6 @@
#include <string>
#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -14,6 +13,7 @@
#include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "sync/api/attachments/attachment_id.h"
#include "sync/api/sync_change.h"
#include "sync/api/sync_error_factory_mock.h"
@@ -98,7 +98,7 @@ class SupervisedUserSyncServiceTest : public ::testing::Test {
MockChangeProcessor* change_processor() { return change_processor_; }
private:
- base::MessageLoop message_loop;
+ content::TestBrowserThreadBundle thread_bundle_;
TestingProfile profile_;
SupervisedUserSyncService* service_;