Remove enhanced bookmarks extension

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index af6fc568f9754bcfb6228c7b9bc041e9f7b7be5d..994b62e5d27a071ed4cce0fc230ec5eb0afda82e 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -317,15 +317,6 @@ void ComponentLoader::AddImageLoaderExtension() {
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
 
-void ComponentLoader::AddBookmarksExtensions() {
-  Add(IDR_BOOKMARKS_MANIFEST,
-      base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
-#if defined(ENABLE_ENHANCED_BOOKMARKS)
-  Add(IDR_ENHANCED_BOOKMARKS_MANIFEST,
-      base::FilePath(FILE_PATH_LITERAL("enhanced_bookmark_manager")));
-#endif
-}
-
 void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
   Add(IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("network_speech_synthesis")));
@@ -412,14 +403,16 @@ void ComponentLoader::AddDefaultComponentExtensions(
   if (!skip_session_components) {
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(chromeos::switches::kGuestSession))
-      AddBookmarksExtensions();
+      Add(IDR_BOOKMARKS_MANIFEST,
+          base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
 
     Add(IDR_CROSH_BUILTIN_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/crosh_builtin")));
   }
 #else  // !defined(OS_CHROMEOS)
   DCHECK(!skip_session_components);
-  AddBookmarksExtensions();
+  Add(IDR_BOOKMARKS_MANIFEST,
+      base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("cloud_print")));