Chromium Code Reviews| Index: chromeos/components/tether/tether_connector.cc |
| diff --git a/chromeos/components/tether/tether_connector.cc b/chromeos/components/tether/tether_connector.cc |
| index f0650af95088ac9973e9ad3215b8a1ebfc76e56b..9d7c20236a67e6b7e97784739626011a26083e59 100644 |
| --- a/chromeos/components/tether/tether_connector.cc |
| +++ b/chromeos/components/tether/tether_connector.cc |
| @@ -126,7 +126,7 @@ void TetherConnector::OnSuccessfulConnectTetheringResponse( |
| connect_tethering_operation_.reset(); |
| wifi_hotspot_connector_->ConnectToWifiHotspot( |
| - ssid_copy, password_copy, |
| + ssid_copy, password_copy, active_host_->GetTetherNetworkGuid(), |
|
Kyle Horimoto
2017/05/03 01:53:33
Now that you pass this here, modify the tests to a
|
| base::Bind(&TetherConnector::OnWifiConnection, |
| weak_ptr_factory_.GetWeakPtr(), remote_device_id)); |
| } |
| @@ -242,23 +242,6 @@ void TetherConnector::OnWifiConnection(const std::string& device_id, |
| return; |
| } |
| - bool successful_association = |
| - network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork( |
| - device_id, wifi_network_guid); |
| - if (successful_association) { |
| - PA_LOG(INFO) << "Successfully connected to host device with ID " |
| - << cryptauth::RemoteDevice::TruncateDeviceIdForLogs(device_id) |
| - << ". Tether network ID: \"" << device_id |
| - << "\", Wi-Fi network ID: \"" << wifi_network_guid << "\""; |
| - } else { |
| - PA_LOG(WARNING) << "Successfully connected to host device with ID " |
| - << cryptauth::RemoteDevice::TruncateDeviceIdForLogs( |
| - device_id) |
| - << ", but failed to associate tether network with ID \"" |
| - << device_id << "\" to Wi-Fi network with ID \"" |
| - << wifi_network_guid << "\"."; |
| - } |
| - |
| SetConnectionSucceeded(device_id, wifi_network_guid); |
| } |