Adds NetworkConnect::ConnectToNetworkId(), uses it in detailed VPN page

chromeos/network/network_connect_unittest.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_connect.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_handler.h"
+#include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::NiceMock;
 using testing::Return;
@@ skipping 187 matching lines @@
   EXPECT_CALL(*mock_delegate_, ShowEnrollNetwork(_)).Times(AnyNumber());
   EXPECT_CALL(*mock_delegate_, ShowNetworkConfigure(kWiFi1Guid));
 
   ON_CALL(*mock_delegate_, ShowEnrollNetwork(kWiFi1Guid))
       .WillByDefault(Return(false));
 
   NetworkConnect::Get()->MaybeShowConfigureUI(
       kWiFi1Guid, NetworkConnectionHandler::kErrorCertificateRequired);
 }
 
+TEST_F(NetworkConnectTest, ConnectThenDisconnectWiFiNetwork) {
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+          kWiFi1Guid);
+
+  NetworkConnect::Get()->ConnectToNetworkId(kWiFi1Guid);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(network->IsConnectedState());
+
+  NetworkConnect::Get()->DisconnectFromNetworkId(kWiFi1Guid);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_FALSE(network->IsConnectedState());
+  EXPECT_FALSE(network->IsConnectingState());
+}
+
 // ShowNetworkSettings only applies to cellular networks.
 TEST_F(NetworkConnectTest, ShowNetworkSettings) {
   EXPECT_CALL(*mock_delegate_, ShowNetworkSettings(kCellular1Guid));
 
   NetworkConnect::Get()->MaybeShowConfigureUI(
       kCellular1Guid, NetworkConnectionHandler::kErrorConnectFailed);
 }
 
 TEST_F(NetworkConnectTest, ShowNetworkSettings_CellOutOfCredits) {
   EXPECT_CALL(*mock_delegate_, ShowNetworkSettings(kCellular1Guid)).Times(0);
@@ skipping 100 matching lines @@
 TEST_F(NetworkConnectTest, ConnectToTetherNetwork_TetherDelegateNotSet) {
   EXPECT_CALL(*mock_tether_delegate_, ConnectToNetwork(_)).Times(0);
 
   NetworkHandler::Get()->network_state_handler()->AddTetherNetworkState(
       kTether1Guid, "TetherNetwork");
 
   NetworkConnect::Get()->ConnectToNetworkId(kTether1Guid);
 }
 
 }  // namespace chromeos