Move enable_app_list to a buildflag.

chrome/browser/sync/profile_sync_service_factory_unittest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "build/build_config.h"
+#include "chrome/common/features.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/browser_sync/browser_sync_switches.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/driver/data_type_controller.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_switches.h"
 
 using browser_sync::ProfileSyncService;
 using syncer::DataTypeController;
 
 class ProfileSyncServiceFactoryTest : public testing::Test {
  protected:
   ProfileSyncServiceFactoryTest() : profile_(new TestingProfile()) {}
 
   // Returns the collection of default datatypes.
   std::vector<syncer::ModelType> DefaultDatatypes() {
     std::vector<syncer::ModelType> datatypes;
 
     // Desktop types.
 #if !defined(OS_ANDROID)
     datatypes.push_back(syncer::APPS);
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
     if (app_list::switches::IsAppListSyncEnabled())
       datatypes.push_back(syncer::APP_LIST);
 #endif
     datatypes.push_back(syncer::APP_SETTINGS);
 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
     datatypes.push_back(syncer::DICTIONARY);
 #endif
 #if defined(OS_CHROMEOS)
     datatypes.push_back(syncer::ARC_PACKAGE);
 #endif
@@ skipping 95 matching lines @@
   syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE,
                                       syncer::BOOKMARKS);
   SetDisabledTypes(disabled_types);
   ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile());
   DataTypeController::StateMap controller_states;
   pss->GetDataTypeControllerStates(&controller_states);
   EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(),
             controller_states.size());
   CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types);
 }