Let AutoConnectHandler wait for user policy before disconnecting

chromeos/network/auto_connect_handler.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_AUTO_CONNECT_HANDLER_H_
 #define CHROMEOS_NETWORK_AUTO_CONNECT_HANDLER_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 40 matching lines @@
 
   void Init(ClientCertResolver* client_cert_resolver,
             NetworkConnectionHandler* network_connection_handler,
             NetworkStateHandler* network_state_handler,
             ManagedNetworkConfigurationHandler*
                 managed_network_configuration_handler);
 
   // If the user logged in already and the policy to prevent unmanaged & shared
   // networks to autoconnect is enabled, then disconnects all such networks
   // except wired networks. It will do this only once after the user logged in
-  // and the device policy was available.
+  // and the device policy and user policy was available.
   // This is enforced once after a user logs in 1) to allow mananged networks to
   // autoconnect and 2) to prevent a previous user from foisting a network on
   // the new user. Therefore, this function is called at login and when the
-  // device policy is changed.
+  // device policy is changed after user policy is fetched and applied.
   void DisconnectIfPolicyRequires();
 
   // Disconnects from all unmanaged and shared WiFi networks that are currently
   // connected or connecting.
   void DisconnectFromUnmanagedSharedWiFiNetworks();
 
   // Requests and if possible connects to the 'best' available network, see
   // CheckBestConnection().
   void RequestBestConnection();
 
@@ skipping 37 matching lines @@
   bool connect_to_best_services_after_scan_;
 
   base::WeakPtrFactory<AutoConnectHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoConnectHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_AUTO_CONNECT_HANDLER_H_