Trigger ConnectToBestNetwork in more cases.

chromeos/network/network_connection_handler_unittest.cc

Index: chromeos/network/network_connection_handler_unittest.cc
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc
index b2c61acf8bf94a8c89a277fc3aabe6574fe22daa..31b04c2c7ecb6e9b31c0b6c004119f5f68b02898 100644
--- a/chromeos/network/network_connection_handler_unittest.cc
+++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -426,114 +426,6 @@ TEST_F(NetworkConnectionHandlerTest,
   EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset());
 }
 
-namespace {
-
-const char* kConfigUnmanagedSharedConnected =
-    "{ \"GUID\": \"wifi0\", \"Type\": \"wifi\", \"State\": \"online\", "
-    "  \"Security\": \"wpa\" }";
-const char* kConfigManagedSharedConnectable =
-    "{ \"GUID\": \"wifi1\", \"Type\": \"wifi\", \"State\": \"idle\", "
-    "  \"Connectable\": true, \"Security\": \"wpa\" }";
-
-const char* kPolicy =
-    "[ { \"GUID\": \"wifi1\","
-    "    \"Name\": \"wifi1\","
-    "    \"Type\": \"WiFi\","
-    "    \"WiFi\": {"
-    "      \"Security\": \"WPA-PSK\","
-    "      \"SSID\": \"wifi1\","
-    "      \"Passphrase\": \"passphrase\""
-    "    }"
-    "} ]";
-
-}  // namespace
-
-TEST_F(NetworkConnectionHandlerTest, ReconnectOnCertLoading) {
-  EXPECT_TRUE(Configure(kConfigUnmanagedSharedConnected));
-  EXPECT_TRUE(Configure(kConfigManagedSharedConnectable));
-  test_manager_client_->SetBestServiceToConnect("wifi1");
-
-  // User login shouldn't trigger any change until the certificates and policy
-  // are loaded.
-  LoginToRegularUser();
-  EXPECT_EQ(shill::kStateOnline,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-
-  // Applying the policy which restricts autoconnect should disconnect from the
-  // shared, unmanaged network.
-  base::DictionaryValue global_config;
-  global_config.SetBooleanWithoutPathExpansion(
-      ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
-      true);
-
-  SetupPolicy(kPolicy, global_config, false /* load as device policy */);
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-
-  // Certificate loading should trigger connecting to the 'best' network.
-  StartCertLoader();
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateOnline,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-}
-
-TEST_F(NetworkConnectionHandlerTest, DisconnectOnPolicyLoading) {
-  EXPECT_TRUE(Configure(kConfigUnmanagedSharedConnected));
-  EXPECT_TRUE(Configure(kConfigManagedSharedConnectable));
-
-  // User login and certificate loading shouldn't trigger any change until the
-  // policy is loaded.
-  LoginToRegularUser();
-  StartCertLoader();
-  EXPECT_EQ(shill::kStateOnline,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-
-  base::DictionaryValue global_config;
-  global_config.SetBooleanWithoutPathExpansion(
-      ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
-      true);
-
-  // Applying the policy which restricts autoconnect should disconnect from the
-  // shared, unmanaged network.
-  // Because no best service is set, the fake implementation of
-  // ConnectToBestServices will be a no-op.
-  SetupPolicy(kPolicy, global_config, false /* load as device policy */);
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-}
-
-TEST_F(NetworkConnectionHandlerTest, ReconnectOnEmptyPolicyLoading) {
-  EXPECT_TRUE(Configure(kConfigUnmanagedSharedConnected));
-  EXPECT_TRUE(Configure(kConfigManagedSharedConnectable));
-  test_manager_client_->SetBestServiceToConnect("wifi1");
-
-  // User login and certificate loading shouldn't trigger any change until the
-  // policy is loaded.
-  LoginToRegularUser();
-  StartCertLoader();
-  EXPECT_EQ(shill::kStateOnline,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-
-  // Apply an empty policy should trigger connecting to the 'best' network.
-  base::DictionaryValue global_config;
-  SetupPolicy(kPolicy, global_config, false /* load as device policy */);
-  EXPECT_EQ(shill::kStateIdle,
-            GetServiceStringProperty("wifi0", shill::kStateProperty));
-  EXPECT_EQ(shill::kStateOnline,
-            GetServiceStringProperty("wifi1", shill::kStateProperty));
-}
-
 }  // namespace chromeos
 
 #endif