Revert r124164 "Rewrite bookmark/history URLs for Guest mode in ChromeOS to New Tab URL"

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 63570d9f5d24e1bd8e886fdaa360c7dead1f82b5..2a0b103cccd4b5a662a87b0d14a487f2b127c72f 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -28,10 +28,6 @@
 #include "chrome/browser/defaults.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/user_manager.h"
-#endif
-
 namespace extensions {
 
 ComponentLoader::ComponentLoader(ExtensionServiceInterface* extension_service,
@@ -261,13 +257,7 @@ void ComponentLoader::AddOrReloadEnterpriseWebStore() {
 }
 
 void ComponentLoader::AddDefaultComponentExtensions() {
-#if defined(OS_CHROMEOS)
-  if (!chromeos::UserManager::Get()->IsLoggedInAsGuest())
-    Add(IDR_BOOKMARKS_MANIFEST,
-        FilePath(FILE_PATH_LITERAL("bookmark_manager")));
-#else
   Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager")));
-#endif
 
 #if defined(FILE_MANAGER_EXTENSION)
   AddFileManagerExtension();