Elim unused NetworkConnect function

Bug: None
Change-Id: Ib881ec300b0fa0d3ee5666a905fb650d2dd9a9c5
Reviewed-on: https://chromium-review.googlesource.com/887727
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533024}

chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc

@@ -45,10 +45,6 @@ class TetherNotificationPresenterTest : public BrowserWithTestWindowTest {
 
     // NetworkConnect:
     void DisconnectFromNetworkId(const std::string& network_id) override {}
-    bool MaybeShowConfigureUI(const std::string& network_id,
-                              const std::string& connect_error) override {
-      return false;
-    }
     void SetTechnologyEnabled(const chromeos::NetworkTypePattern& technology,
                               bool enabled_state) override {}
     void ShowMobileSetup(const std::string& network_id) override {}

chromeos/components/tether/wifi_hotspot_connector_unittest.cc

@@ -96,10 +96,6 @@ class WifiHotspotConnectorTest : public NetworkStateTest {
     }
 
     // NetworkConnect:
-    bool MaybeShowConfigureUI(const std::string& network_id,
-                              const std::string& connect_error) override {
-      return false;
-    }
     void SetTechnologyEnabled(const chromeos::NetworkTypePattern& technology,
                               bool enabled_state) override {}
     void ShowMobileSetup(const std::string& network_id) override {}

chromeos/network/network_connect.cc

@@ -53,8 +53,6 @@ class NetworkConnectImpl : public NetworkConnect {
   // NetworkConnect
   void ConnectToNetworkId(const std::string& network_id) override;
   void DisconnectFromNetworkId(const std::string& network_id) override;
-  bool MaybeShowConfigureUI(const std::string& network_id,
-                            const std::string& connect_error) override;
   void SetTechnologyEnabled(const NetworkTypePattern& technology,
                             bool enabled_state) override;
   void ShowMobileSetup(const std::string& network_id) override;
@@ -73,8 +71,6 @@ class NetworkConnectImpl : public NetworkConnect {
   void OnConnectFailed(const std::string& network_id,
                        const std::string& error_name,
                        std::unique_ptr<base::DictionaryValue> error_data);
-  bool MaybeShowConfigureUIImpl(const std::string& network_id,
-                                const std::string& connect_error);
   bool GetNetworkProfilePath(bool shared, std::string* profile_path);
   void OnConnectSucceeded(const std::string& network_id);
   void CallConnectToNetwork(const std::string& network_id,
@@ -194,42 +190,22 @@ void NetworkConnectImpl::OnConnectFailed(
     const std::string& network_id,
     const std::string& error_name,
     std::unique_ptr<base::DictionaryValue> error_data) {
-  MaybeShowConfigureUIImpl(network_id, error_name);
-}
-
-// This handles connect failures that are a direct result of a user initiated
-// connect request and result in a new UI being shown. Note: notifications are
-// handled by NetworkStateNotifier.
-bool NetworkConnectImpl::MaybeShowConfigureUIImpl(
-    const std::string& network_id,
-    const std::string& connect_error) {
-  NET_LOG_ERROR("Connect Failed: " + connect_error, network_id);
+  NET_LOG(ERROR) << "Connect Failed: " << error_name << " For: " << network_id;
 
-  if (connect_error == NetworkConnectionHandler::kErrorBadPassphrase ||
-      connect_error == NetworkConnectionHandler::kErrorPassphraseRequired ||
-      connect_error == NetworkConnectionHandler::kErrorConfigurationRequired ||
-      connect_error == NetworkConnectionHandler::kErrorAuthenticationRequired) {
+  if (error_name == NetworkConnectionHandler::kErrorConnectFailed ||
+      error_name == NetworkConnectionHandler::kErrorBadPassphrase ||
+      error_name == NetworkConnectionHandler::kErrorPassphraseRequired ||
+      error_name == NetworkConnectionHandler::kErrorConfigurationRequired ||
+      error_name == NetworkConnectionHandler::kErrorAuthenticationRequired) {
     HandleUnconfiguredNetwork(network_id);
-    return true;
-  }
-
-  if (connect_error == NetworkConnectionHandler::kErrorCertificateRequired) {
+  } else if (error_name ==
+             NetworkConnectionHandler::kErrorCertificateRequired) {
+    // If ShowEnrollNetwork does fails, treat as an unconfigured network.
     if (!delegate_->ShowEnrollNetwork(network_id))
       HandleUnconfiguredNetwork(network_id);
-    return true;
-  }
-
-  // Only show a configure dialog if there was a ConnectFailed error. The dialog
-  // allows the user to request a new connect attempt or cancel. Note: a
-  // notification may also be displayed by NetworkStateNotifier in this case.
-  if (connect_error == NetworkConnectionHandler::kErrorConnectFailed) {
-    HandleUnconfiguredNetwork(network_id);
-    return true;
   }
-
   // Notifications for other connect failures are handled by
   // NetworkStateNotifier, so no need to do anything else here.
-  return false;
 }
 
 void NetworkConnectImpl::OnConnectSucceeded(const std::string& network_id) {
@@ -413,12 +389,6 @@ void NetworkConnectImpl::DisconnectFromNetworkId(
       base::Bind(&IgnoreDisconnectError));
 }
 
-bool NetworkConnectImpl::MaybeShowConfigureUI(
-    const std::string& network_id,
-    const std::string& connect_error) {
-  return MaybeShowConfigureUIImpl(network_id, connect_error);
-}
-
 void NetworkConnectImpl::SetTechnologyEnabled(
     const NetworkTypePattern& technology,
     bool enabled_state) {

chromeos/network/network_connect.h

@@ -71,11 +71,6 @@ class CHROMEOS_EXPORT NetworkConnect {
   // Requests a network disconnection. Ignores any errors and notifications.
   virtual void DisconnectFromNetworkId(const std::string& network_id) = 0;
 
-  // Maybe show the configuration UI after a connect failure based on the
-  // network state and error name. Returns true if the UI is shown.
-  virtual bool MaybeShowConfigureUI(const std::string& network_id,
-                                    const std::string& connect_error) = 0;
-
   // Enables or disables a network technology. If |technology| refers to
   // cellular and the device cannot be enabled due to a SIM lock, this function
   // will launch the SIM unlock dialog.

chromeos/network/network_connect_unittest.cc

@@ -213,62 +213,6 @@ TEST_F(NetworkConnectTest,
                                                       false);
 }
 
-TEST_F(NetworkConnectTest, ShowConfigureUI) {
-  EXPECT_CALL(*mock_delegate_, ShowNetworkConfigure(kWiFi1Guid)).Times(5);
-
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorBadPassphrase);
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorPassphraseRequired);
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorConfigurationRequired);
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorAuthenticationRequired);
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorConnectFailed);
-}
-
-TEST_F(NetworkConnectTest, ConfigureUINotShownForTetherAssociatedWifiNetwork) {
-  // The configure UI should *not* be shown for Wi-Fi networks which serve as
-  // the underlying Wi-Fi hotspot for a Tether network.
-  EXPECT_CALL(*mock_delegate_, ShowNetworkConfigure(kWiFi1Guid)).Times(0);
-
-  AddTetherNetwork(false /* has_connected_to_host */);
-  NetworkHandler::Get()
-      ->network_state_handler()
-      ->AssociateTetherNetworkStateWithWifiNetwork(kTetherGuid, kWiFi1Guid);
-
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorConnectFailed);
-}
-
-TEST_F(NetworkConnectTest, ShowConfigureUI_BadErrorCode) {
-  EXPECT_CALL(*mock_delegate_, ShowNetworkConfigure(kWiFi1Guid)).Times(0);
-
-  NetworkConnect::Get()->MaybeShowConfigureUI(kWiFi1Guid,
-                                              "incorrect error code");
-}
-
-TEST_F(NetworkConnectTest, ShowConfigureUI_CertRequired_ShowEnrollNetwork) {
-  EXPECT_CALL(*mock_delegate_, ShowEnrollNetwork(_)).Times(AnyNumber());
-  EXPECT_CALL(*mock_delegate_, ShowNetworkConfigure(kWiFi1Guid)).Times(0);
-
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kWiFi1Guid, NetworkConnectionHandler::kErrorCertificateRequired);
-}
-
-TEST_F(NetworkConnectTest,
-       ShowConfigureUI_CertRequired_DoNotShowEnrollNetwork) {
-  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(
@@ -304,26 +248,6 @@ TEST_F(NetworkConnectTest, ConnectToTetherNetwork_HasNotConnectedToHost) {
       fake_tether_delegate_->last_connected_tether_network_guid().empty());
 }
 
-// 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);
-  EXPECT_CALL(*mock_delegate_, ShowMobileSetupDialog(kCellular1Guid));
-
-  service_test_->SetServiceProperty(
-      kCellular1ServicePath, shill::kOutOfCreditsProperty, base::Value(true));
-  base::RunLoop().RunUntilIdle();
-
-  NetworkConnect::Get()->MaybeShowConfigureUI(
-      kCellular1Guid, NetworkConnectionHandler::kErrorConnectFailed);
-}
-
 TEST_F(NetworkConnectTest, ActivateCellular) {
   EXPECT_CALL(*mock_delegate_, ShowMobileSetupDialog(kCellular1Guid));