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

This broke ComponentLoaderTest on chromeos.

TBR=antrim@chromium.org
BUG=116478
TEST=unit_test on trybot passes

Review URL: https://chromiumcodereview.appspot.com/9564046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124570 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_content_browser_client.cc

@@ -97,7 +97,6 @@
 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_POSIX)
@@ -156,20 +155,6 @@ bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
           browser_context, *url))
     return false;
 
-#if defined(OS_CHROMEOS)
-  // Special case : in ChromeOS in Guest mode bookmarks and history are
-  // disabled for security reasons. New tab page explains the reasons, so
-  // we redirect user to new tab page.
-  if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
-    if (url->SchemeIs(chrome::kChromeUIScheme) &&
-        (url->DomainIs(chrome::kChromeUIBookmarksHost) ||
-         url->DomainIs(chrome::kChromeUIHistoryHost))) {
-      // Rewrite with new tab URL
-      *url = GURL(chrome::kChromeUINewTabURL);
-    }
-  }
-#endif
-
   // Special case the new tab page. In older versions of Chrome, the new tab
   // page was hosted at chrome-internal:<blah>. This might be in people's saved
   // sessions or bookmarks, so we say any URL with that scheme triggers the new

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();