Fix reconnect in case of empty global network policy.

chromeos/network/network_connection_handler.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 "chromeos/network/network_connection_handler.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 769 matching lines @@
   if (!global_network_config)
     return;
 
   applied_autoconnect_policy_ = true;
 
   bool only_policy_autoconnect = false;
   global_network_config->GetBooleanWithoutPathExpansion(
       ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
       &only_policy_autoconnect);
 
-  if (!only_policy_autoconnect)
-    return;
+  if (only_policy_autoconnect)
+    DisconnectFromUnmanagedSharedWiFiNetworks();
 
-  NET_LOG_DEBUG("DisconnectIfPolicyRequires",
-                "Disconnecting unmanaged and shared networks if any exist.");
+  ConnectToBestNetworkAfterLogin();
+}
 
-  // Get the list of unmanaged & shared networks that are connected or
-  // connecting.
+void NetworkConnectionHandler::DisconnectFromUnmanagedSharedWiFiNetworks() {
+  NET_LOG_DEBUG("DisconnectFromUnmanagedSharedWiFiNetworks", "");
+
   NetworkStateHandler::NetworkStateList networks;
   network_state_handler_->GetVisibleNetworkListByType(
       NetworkTypePattern::Wireless(), &networks);
   for (NetworkStateHandler::NetworkStateList::const_iterator it =
            networks.begin();
        it != networks.end();
        ++it) {
     const NetworkState* network = *it;
     if (!(network->IsConnectingState() || network->IsConnectedState()))
       break;  // Connected and connecting networks are listed first.
 
     if (network->IsPrivate())
       continue;
 
     const bool network_is_policy_managed =
         !network->profile_path().empty() && !network->guid().empty() &&
         managed_configuration_handler_->FindPolicyByGuidAndProfile(
             network->guid(), network->profile_path());
     if (network_is_policy_managed)
       continue;
 
     NET_LOG_EVENT("Disconnect Forced by Policy", network->path());
     CallShillDisconnect(
         network->path(), base::Closure(), network_handler::ErrorCallback());
   }
-
-  ConnectToBestNetworkAfterLogin();
 }
 
 }  // namespace chromeos