Componentize enhanced_bookmark_features.{h,cc}.

chrome/common/chrome_switches.h

Index: chrome/common/chrome_switches.h
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index a3b53926b257fc1636d23f6d51ec38a72a6dc5e6..ca1943c6658b0d2f68b1b722f504fc1c7acd242c 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -12,6 +12,8 @@
 #include "base/base_switches.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
+#include "components/dom_distiller/core/dom_distiller_switches.h"
+#include "components/enhanced_bookmarks/enhanced_bookmark_switches.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "components/signin/core/common/signin_switches.h"
 #include "content/public/common/content_switches.h"
@@ -120,7 +122,6 @@ extern const char kEnableClearBrowsingDataCounters[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableDevToolsExperiments[];
 extern const char kEnableDeviceDiscoveryNotifications[];
-extern const char kEnableDomDistiller[];
 extern const char kEnableDownloadNotification[];
 extern const char kEnhancedBookmarksExperiment[];
 extern const char kEnableDomainReliability[];
@@ -158,13 +159,11 @@ extern const char kDisableSettingsWindow[];
 extern const char kEnableSiteEngagementService[];
 extern const char kEnableSuggestionsService[];
 extern const char kEnableSupervisedUserManagedBookmarksFolder[];
-extern const char kEnableSyncArticles[];
 extern const char kEnableTabAudioMuting[];
 extern const char kEnableThumbnailRetargeting[];
 extern const char kEnableUserAlternateProtocolPorts[];
 extern const char kEnableWebAppFrame[];
 extern const char kEnableWifiCredentialSync[];
-extern const char kEnhancedBookmarksExperiment[];
 extern const char kExtensionContentVerificationBootstrap[];
 extern const char kExtensionContentVerificationEnforceStrict[];
 extern const char kExtensionContentVerificationEnforce[];