| Index: chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
|
| index 69ed66db2d2332cbf734eacf88ed9e9a83bde686..73f3a635fa136c657120ee30aeed920f58ccc504 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
|
| @@ -74,7 +74,7 @@ NetworkingPrivateEventRouterImpl::NetworkingPrivateEventRouterImpl(
|
| // our events. We first check and see if there *is* an event router, because
|
| // some unit tests try to create all profile services, but don't initialize
|
| // the event router first.
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| if (event_router) {
|
| event_router->RegisterObserver(
|
| this, api::networking_private::OnNetworksChanged::kEventName);
|
| @@ -94,7 +94,7 @@ void NetworkingPrivateEventRouterImpl::Shutdown() {
|
| // Unregister with the event router. We first check and see if there *is* an
|
| // event router, because some unit tests try to shutdown all profile services,
|
| // but didn't initialize the event router first.
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| if (event_router)
|
| event_router->UnregisterObserver(this);
|
|
|
| @@ -119,7 +119,7 @@ void NetworkingPrivateEventRouterImpl::OnListenerRemoved(
|
| }
|
|
|
| void NetworkingPrivateEventRouterImpl::StartOrStopListeningForNetworkChanges() {
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| bool should_listen =
|
| event_router->HasEventListener(
|
| api::networking_private::OnNetworksChanged::kEventName) ||
|
| @@ -141,7 +141,7 @@ void NetworkingPrivateEventRouterImpl::StartOrStopListeningForNetworkChanges() {
|
| }
|
|
|
| void NetworkingPrivateEventRouterImpl::NetworkListChanged() {
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| NetworkStateHandler::NetworkStateList networks;
|
| NetworkHandler::Get()->network_state_handler()->GetNetworkList(&networks);
|
| if (!event_router->HasEventListener(
|
| @@ -174,7 +174,7 @@ void NetworkingPrivateEventRouterImpl::NetworkListChanged() {
|
|
|
| void NetworkingPrivateEventRouterImpl::NetworkPropertiesUpdated(
|
| const NetworkState* network) {
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| if (!event_router->HasEventListener(
|
| api::networking_private::OnNetworksChanged::kEventName)) {
|
| NET_LOG_EVENT("NetworkingPrivate.NetworkPropertiesUpdated: No Listeners",
|
| @@ -196,7 +196,7 @@ void NetworkingPrivateEventRouterImpl::OnPortalDetectionCompleted(
|
| const NetworkPortalDetector::CaptivePortalState& state) {
|
| const std::string path = network ? network->path() : std::string();
|
|
|
| - EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
|
| + EventRouter* event_router = EventRouter::Get(profile_);
|
| if (!event_router->HasEventListener(
|
| api::networking_private::OnPortalDetectionCompleted::kEventName)) {
|
| NET_LOG_EVENT("NetworkingPrivate.OnPortalDetectionCompleted: No Listeners",
|
|
|