chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc - Issue 222553003: Disable AppList sync by default on non Chrome OS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 222553003: Disable AppList sync by default on non Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 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

« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

index 430c311c4562214b312fd23303ab9372d03e0691..ad55fa3e8e812b370ddefa39f471a0cd66072848 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

@@ -18,6 +18,7 @@

#include "components/sync_driver/data_type_controller.h"

#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "ui/app_list/app_list_switches.h"

using browser_sync::DataTypeController;

using content::BrowserThread;

@@ -38,7 +39,8 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {

std::vector<syncer::ModelType> datatypes;

datatypes.push_back(syncer::APPS);

#if defined(ENABLE_APP_LIST)

- datatypes.push_back(syncer::APP_LIST);

+ if (app_list::switches::IsAppListSyncEnabled())

+ datatypes.push_back(syncer::APP_LIST);

#endif

datatypes.push_back(syncer::APP_SETTINGS);

datatypes.push_back(syncer::AUTOFILL);