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 5a7ef974a6588081c708b44d01e0380eddfa71c8..1ae9984b7cab006349d8d99fd54ed4a4ece81e2f 100644 |
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc |
@@ -21,13 +21,16 @@ |
#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" |
#include "sync/protocol/sync.pb.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#if !defined(OS_ANDROID) |
+#include "components/safe_json/testing_json_parser.h" |
+#endif |
+ |
namespace { |
const char kClientId[] = "client-id"; |
@@ -152,7 +155,9 @@ class SupervisedUserWhitelistServiceTest : public testing::Test { |
content::TestBrowserThreadBundle thread_bundle_; |
TestingProfile profile_; |
+#if !defined(OS_ANDROID) |
safe_json::TestingJsonParser::ScopedFactoryOverride factory_override_; |
+#endif |
scoped_ptr<MockSupervisedUserWhitelistInstaller> installer_; |
scoped_ptr<SupervisedUserWhitelistService> service_; |