Return management state without retrieving the management domain if the

chrome/browser/policy/profile_policy_connector.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/policy/profile_policy_connector.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 136 matching lines @@
   if (special_user_policy_provider_)
     special_user_policy_provider_->Shutdown();
 #endif
   if (wrapped_platform_policy_provider_)
     wrapped_platform_policy_provider_->Shutdown();
 }
 
 bool ProfilePolicyConnector::IsManaged() const {
   if (is_managed_override_)
     return *is_managed_override_;
+  if (policy_store_)
+    return policy_store_->is_managed();
   return !GetManagementDomain().empty();

[Thiemo Nagel, 2017/02/14 17:06:03]

I'd suggest to use the store also in the case of special policy provider, that
way you can get rid of GetManagementDomain() completely.

[Marton Hunyady, 2017/02/14 19:22:17]

Done.

 }
 
 std::string ProfilePolicyConnector::GetManagementDomain() const {
   if (policy_store_)
     return GetStoreManagementDomain(policy_store_);
 #if defined(OS_CHROMEOS)
   if (special_user_policy_provider_) {
     // |special_user_policy_provider_| is non-null for device-local accounts and
     // for the login profile.
     // They receive policy iff the device itself is managed.
@@ skipping 21 matching lines @@
     const char* policy_key) const {
   const PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
   for (const ConfigurationPolicyProvider* provider : policy_providers_) {
     if (provider->policies().Get(chrome_ns).Get(policy_key))
       return provider;
   }
   return nullptr;
 }
 
 }  // namespace policy