Added ability to enable enhanced bookmarks related features from a finch experiment
Left "enable-override-bookmark-ui" out until Mike's CL finalizes

BUG=321393

Review URL: https://codereview.chromium.org/100803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238858 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 8aca2c2..fde8236 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -17,7 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/base/switches.h"
-#include "chrome/browser/extensions/external_component_loader.h"
+#include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/flags_storage.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
@@ -1960,8 +1960,7 @@
 
 bool SkipConditionalExperiment(const Experiment& experiment) {
   if (experiment.internal_name == std::string("enable-enhanced-bookmarks")) {
-    return !extensions::ExternalComponentLoader::
-        IsEnhancedBookmarksExperimentEnabled();
+    return !IsEnhancedBookmarksExperimentEnabled();
   }
   return false;
 }