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

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OFFICIAL_BUILD)
 #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,
                                  PrefService* prefs,
                                  PrefService* local_state)
     : prefs_(prefs),
       local_state_(local_state),
       extension_service_(extension_service) {
   pref_change_registrar_.Init(prefs);
 
@@ skipping 209 matching lines @@
     if (manifest) {
       std::string name = prefs_->GetString(prefs::kEnterpriseWebStoreName);
       manifest->SetString("app.launch.web_url", enterprise_webstore_url);
       manifest->SetString("name", name);
       Add(manifest, path);
     }
   }
 }
 
 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();
 #endif
 
 #if defined(USE_VIRTUAL_KEYBOARD)
   Add(IDR_KEYBOARD_MANIFEST, FilePath(FILE_PATH_LITERAL("keyboard")));
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 61 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions