Let AutoConnectHandler wait for user policy before disconnecting

chromeos/network/auto_connect_handler.cc

 // Copyright 2014 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 "chromeos/network/auto_connect_handler.h"
 
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
@@ skipping 82 matching lines @@
 }
 
 void AutoConnectHandler::PoliciesChanged(const std::string& userhash) {
   // Ignore user policies.
   if (!userhash.empty())
     return;
   DisconnectIfPolicyRequires();
 }
 
 void AutoConnectHandler::PoliciesApplied(const std::string& userhash) {
-  if (userhash.empty())
+  if (userhash.empty()) {
     device_policy_applied_ = true;
-  else
+  } else {
     user_policy_applied_ = true;
+    DisconnectIfPolicyRequires();
+  }
 
   // Request to connect to the best network only if there is at least one
   // managed network. Otherwise only process existing requests.
   const ManagedNetworkConfigurationHandler::GuidToPolicyMap* managed_networks =
       managed_configuration_handler_->GetNetworkConfigsFromPolicy(userhash);
   DCHECK(managed_networks);
   if (!managed_networks->empty()) {
     NET_LOG_DEBUG("RequestBestConnection", "Policy applied");
     RequestBestConnection();
   } else {
@@ skipping 70 matching lines @@
   if (connect_to_best_services_after_scan_)
     return;
   connect_to_best_services_after_scan_ = true;
   if (!network_state_handler_->GetScanningByType(
           NetworkTypePattern::Primitive(shill::kTypeWifi))) {
     network_state_handler_->RequestScan();
   }
 }
 
 void AutoConnectHandler::DisconnectIfPolicyRequires() {
-  if (applied_autoconnect_policy_ || !LoginState::Get()->IsUserLoggedIn())
+  if (applied_autoconnect_policy_ || !LoginState::Get()->IsUserLoggedIn() ||
+      !user_policy_applied_) {
     return;
+  }
 
   const base::DictionaryValue* global_network_config =
       managed_configuration_handler_->GetGlobalConfigFromPolicy(
           std::string() /* no username hash, device policy */);
 
   if (!global_network_config)
     return;  // Device policy is not set, yet.
 
   applied_autoconnect_policy_ = true;
 
@@ skipping 38 matching lines @@
 void AutoConnectHandler::CallShillConnectToBestServices() const {
   NET_LOG_EVENT("ConnectToBestServices", "");
   DBusThreadManager::Get()->GetShillManagerClient()->ConnectToBestServices(
       base::Bind(&base::DoNothing),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  "ConnectToBestServices Failed",
                  "", network_handler::ErrorCallback()));
 }
 
 }  // namespace chromeos