Index: components/arc/net/arc_net_host_impl.cc |
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc |
index 63fe32950d171e64a05c11b4bee13f60728e3b23..4459807cc931e2ced08b3a78419a72d78bd02970 100644 |
--- a/components/arc/net/arc_net_host_impl.cc |
+++ b/components/arc/net/arc_net_host_impl.cc |
@@ -305,24 +305,25 @@ namespace arc { |
ArcNetHostImpl::ArcNetHostImpl(ArcBridgeService* bridge_service) |
: ArcService(bridge_service), binding_(this), weak_factory_(this) { |
- arc_bridge_service()->AddObserver(this); |
+ arc_bridge_service()->net()->AddObserver(this); |
GetStateHandler()->AddObserver(this, FROM_HERE); |
} |
ArcNetHostImpl::~ArcNetHostImpl() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- arc_bridge_service()->RemoveObserver(this); |
+ arc_bridge_service()->net()->RemoveObserver(this); |
if (chromeos::NetworkHandler::IsInitialized()) { |
GetStateHandler()->RemoveObserver(this, FROM_HERE); |
} |
} |
-void ArcNetHostImpl::OnNetInstanceReady() { |
+void ArcNetHostImpl::OnInstanceReady(mojom::NetInstance* net_instance, |
+ uint32_t version) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
mojom::NetHostPtr host; |
binding_.Bind(GetProxy(&host)); |
- arc_bridge_service()->net_instance()->Init(std::move(host)); |
+ net_instance->Init(std::move(host)); |
} |
void ArcNetHostImpl::GetNetworksDeprecated( |
@@ -553,16 +554,16 @@ void ArcNetHostImpl::StartScan() { |
} |
void ArcNetHostImpl::ScanCompleted(const chromeos::DeviceState* /*unused*/) { |
- if (!arc_bridge_service()->net_instance()) { |
+ if (!arc_bridge_service()->net()->instance()) { |
VLOG(2) << "NetInstance not ready yet"; |
return; |
} |
- if (arc_bridge_service()->net_version() < 1) { |
+ if (arc_bridge_service()->net()->version() < 1) { |
VLOG(1) << "NetInstance does not support ScanCompleted."; |
return; |
} |
- arc_bridge_service()->net_instance()->ScanCompleted(); |
+ arc_bridge_service()->net()->instance()->ScanCompleted(); |
} |
void ArcNetHostImpl::GetDefaultNetwork( |
@@ -586,22 +587,22 @@ void ArcNetHostImpl::GetDefaultNetwork( |
void ArcNetHostImpl::DefaultNetworkSuccessCallback( |
const std::string& service_path, |
const base::DictionaryValue& dictionary) { |
- arc_bridge_service()->net_instance()->DefaultNetworkChanged( |
+ arc_bridge_service()->net()->instance()->DefaultNetworkChanged( |
TranslateONCConfiguration(&dictionary), |
TranslateONCConfiguration(&dictionary)); |
} |
void ArcNetHostImpl::DefaultNetworkChanged( |
const chromeos::NetworkState* network) { |
- if (arc_bridge_service()->net_version() < 2) { |
+ if (arc_bridge_service()->net()->version() < 2) { |
VLOG(1) << "ArcBridgeService does not support DefaultNetworkChanged."; |
return; |
} |
if (!network) { |
VLOG(1) << "No default network"; |
- arc_bridge_service()->net_instance()->DefaultNetworkChanged(nullptr, |
- nullptr); |
+ arc_bridge_service()->net()->instance()->DefaultNetworkChanged(nullptr, |
+ nullptr); |
return; |
} |
@@ -615,14 +616,14 @@ void ArcNetHostImpl::DefaultNetworkChanged( |
} |
void ArcNetHostImpl::DeviceListChanged() { |
- if (arc_bridge_service()->net_version() < 3) { |
+ if (arc_bridge_service()->net()->version() < 3) { |
VLOG(1) << "ArcBridgeService does not support DeviceListChanged."; |
return; |
} |
bool is_enabled = GetStateHandler()->IsTechnologyEnabled( |
chromeos::NetworkTypePattern::WiFi()); |
- arc_bridge_service()->net_instance()->WifiEnabledStateChanged(is_enabled); |
+ arc_bridge_service()->net()->instance()->WifiEnabledStateChanged(is_enabled); |
} |
void ArcNetHostImpl::OnShuttingDown() { |