Remove passphrase dialog and last parts of elevation.

chrome/browser/managed_mode/managed_user_service.cc

 // Copyright (c) 2013 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/managed_mode/managed_user_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
 #include "chrome/browser/managed_mode/managed_user_registration_service.h"
 #include "chrome/browser/policy/managed_mode_policy_provider.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
@@ skipping 113 matching lines @@
 
 bool ManagedUserService::ProfileIsManaged() const {
   return ProfileIsManaged(profile_);
 }
 
 // static
 bool ManagedUserService::ProfileIsManaged(Profile* profile) {
   return profile->GetPrefs()->GetBoolean(prefs::kProfileIsManaged);
 }
 
-bool ManagedUserService::IsElevatedForWebContents(
-    const content::WebContents* web_contents) const {
-  const ManagedModeNavigationObserver* observer =
-      ManagedModeNavigationObserver::FromWebContents(web_contents);
-  return observer ? observer->is_elevated() : false;
-}
-
-bool ManagedUserService::IsPassphraseEmpty() const {
-  PrefService* pref_service = profile_->GetPrefs();
-  return pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
-}
-
-bool ManagedUserService::CanSkipPassphraseDialog(
-    const content::WebContents* web_contents) const {
-#if defined(OS_CHROMEOS)
-  NOTREACHED();
-#endif
-  return IsElevatedForWebContents(web_contents) ||
-         IsPassphraseEmpty();
-}
-
-void ManagedUserService::RequestAuthorization(
-    content::WebContents* web_contents,
-    const PassphraseCheckedCallback& callback) {
-#if defined(OS_CHROMEOS)
-  NOTREACHED();
-#endif
-
-  if (CanSkipPassphraseDialog(web_contents)) {
-    callback.Run(true);
-    return;
-  }
-
-  // Is deleted automatically when the dialog is closed.
-  new ManagedUserPassphraseDialog(web_contents, callback);
-}
-
 // static
 void ManagedUserService::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kManagedModeManualHosts,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kManagedModeManualURLs,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kDefaultManagedModeFilteringBehavior, ManagedModeURLFilter::ALLOW,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kManagedModeLocalPassphrase, std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kManagedModeLocalSalt, std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool ManagedUserService::AreManagedUsersEnabled() {
   // Allow enabling by command line for now for easier development.
   return base::FieldTrialList::FindFullName(kManagedModeFinchName) ==
              kManagedModeFinchActive ||
          CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kEnableManagedUsers);
 }
@@ skipping 120 matching lines @@
 
 bool ManagedUserService::ExtensionManagementPolicyImpl(
     const std::string& extension_id,
     string16* error) const {
   if (!ProfileIsManaged())
     return true;
 
   if (elevated_for_testing_)
     return true;
 
-  if (elevated_for_extensions_.count(extension_id))
-    return true;
-
   if (error)
     *error = l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_MANAGED_MODE);
   return false;
 }
 
 ScopedVector<ManagedModeSiteList> ManagedUserService::GetActiveSiteLists() {
   ScopedVector<ManagedModeSiteList> site_lists;
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   // Can be NULL in unit tests.
@@ skipping 249 matching lines @@
       profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs);
   scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>());
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     bool allow = false;
     bool result = it.value().GetAsBoolean(&allow);
     DCHECK(result);
     (*url_map)[GURL(it.key())] = allow;
   }
   url_filter_context_.SetManualURLs(url_map.Pass());
 }