Index: chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
index a269d8d162a2d900c3099aebd2cf11dcd6b47299..5a7ef974a6588081c708b44d01e0380eddfa71c8 100644 |
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
@@ -21,6 +21,7 @@ |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/test/base/testing_profile.h" |
+#include "components/safe_json/testing_json_parser.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
#include "sync/api/sync_change.h" |
#include "sync/api/sync_error_factory.h" |
@@ -90,11 +91,6 @@ class SupervisedUserWhitelistServiceTest : public testing::Test { |
service_->AddSiteListsChangedCallback( |
base::Bind(&SupervisedUserWhitelistServiceTest::OnSiteListsChanged, |
base::Unretained(this))); |
- SupervisedUserSiteList::SetLoadInProcessForTesting(true); |
- } |
- |
- ~SupervisedUserWhitelistServiceTest() override { |
- SupervisedUserSiteList::SetLoadInProcessForTesting(false); |
} |
protected: |
@@ -156,6 +152,8 @@ class SupervisedUserWhitelistServiceTest : public testing::Test { |
content::TestBrowserThreadBundle thread_bundle_; |
TestingProfile profile_; |
+ safe_json::TestingJsonParser::ScopedFactoryOverride factory_override_; |
+ |
scoped_ptr<MockSupervisedUserWhitelistInstaller> installer_; |
scoped_ptr<SupervisedUserWhitelistService> service_; |