Supervised users: Re-check ManagementPolicy when ProfileIsSupervised changes.

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 364 matching lines @@
     bool guest_session,
     const std::string& supervised_user_id,
     scoped_ptr<policy::PolicyService> policy_service,
     const TestingFactories& factories)
     : start_time_(Time::Now()),
       prefs_(prefs.release()),
       testing_prefs_(NULL),
       force_incognito_(false),
       original_profile_(parent),
       guest_session_(guest_session),
-      supervised_user_id_(supervised_user_id),
       last_session_exited_cleanly_(true),
 #if defined(ENABLE_EXTENSIONS)
       extension_special_storage_policy_(extension_policy),
 #endif
       profile_path_(path),
       browser_context_dependency_manager_(
           BrowserContextDependencyManager::GetInstance()),
       resource_context_(NULL),
       delegate_(delegate),
       policy_service_(policy_service.release()) {
@@ skipping 17 matching lines @@
   // tasks have run.
   // TODO(atwilson): See if this is still required once we convert the current
   // users of the constructor that takes a Delegate* param.
   if (delegate_) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&TestingProfile::FinishInit, base::Unretained(this)));
   } else {
     FinishInit();
   }
+
+  SetSupervisedUserId(supervised_user_id);
 }
 
 void TestingProfile::CreateTempProfileDir() {
   if (!temp_dir_.CreateUniqueTempDir()) {
     LOG(ERROR) << "Failed to create unique temporary directory.";
 
     // Fallback logic in case we fail to create unique temporary directory.
     base::FilePath system_tmp_dir;
     bool success = PathService::Get(base::DIR_TEMP, &system_tmp_dir);
 
@@ skipping 326 matching lines @@
 bool TestingProfile::HasOffTheRecordProfile() {
   return incognito_profile_.get() != NULL;
 }
 
 Profile* TestingProfile::GetOriginalProfile() {
   if (original_profile_)
     return original_profile_;
   return this;
 }
 
+void TestingProfile::SetSupervisedUserId(const std::string& id) {
+  supervised_user_id_ = id;
+  if (!id.empty())
+    GetPrefs()->SetString(prefs::kSupervisedUserId, id);
+  else
+    GetPrefs()->ClearPref(prefs::kSupervisedUserId);
+}
+
 bool TestingProfile::IsSupervised() {
   return !supervised_user_id_.empty();
 }
 
 bool TestingProfile::IsChild() {
 #if defined(ENABLE_SUPERVISED_USERS)
   return supervised_user_id_ == supervised_users::kChildAccountSUID;
 #else
   return false;
 #endif
@@ skipping 352 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             pref_service_.Pass(),
                             original_profile,
                             guest_session_,
                             supervised_user_id_,
                             policy_service_.Pass(),
                             testing_factories_);
 }