Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3851)

Unified Diff: chrome/browser/sync/profile_sync_service_factory_unittest.cc

Issue 2740363002: [Sync] Fix EnableDisableSingleClientTest (Closed)
Patch Set: add {} Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service_factory_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory_unittest.cc b/chrome/browser/sync/profile_sync_service_factory_unittest.cc
index e326da8fc124bf6c634546cfa21540fcaae49bad..3c29971019b5afbf0307eba856513208b188f5e0 100644
--- a/chrome/browser/sync/profile_sync_service_factory_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_factory_unittest.cc
@@ -20,6 +20,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/app_list/app_list_switches.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/arc/arc_util.h"
+#endif
+
using browser_sync::ProfileSyncService;
using syncer::DataTypeController;
@@ -51,7 +55,8 @@ class ProfileSyncServiceFactoryTest : public testing::Test {
#endif // !OS_ANDROID
#if defined(OS_CHROMEOS)
- datatypes.push_back(syncer::ARC_PACKAGE);
+ if (arc::IsArcAllowedForProfile(profile()))
+ datatypes.push_back(syncer::ARC_PACKAGE);
datatypes.push_back(syncer::PRINTERS);
#endif // OS_CHROMEOS
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.cc ('k') | chrome/browser/sync/test/integration/enable_disable_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698