Index: extensions/browser/api/networking_config/networking_config_service.cc |
diff --git a/extensions/browser/api/networking_config/networking_config_service.cc b/extensions/browser/api/networking_config/networking_config_service.cc |
index d5d9156bf0d3f7897061869f41a0085dce18b21e..7b4e5eca8af2e50762238e7efc4f7ddc5d6fc4ac 100644 |
--- a/extensions/browser/api/networking_config/networking_config_service.cc |
+++ b/extensions/browser/api/networking_config/networking_config_service.cc |
@@ -182,8 +182,8 @@ scoped_ptr<Event> NetworkingConfigService::CreatePortalDetectedEventAndDispatch( |
return nullptr; |
// Populate the NetworkInfo object. |
- core_api::networking_config::NetworkInfo network_info; |
- network_info.type = core_api::networking_config::NETWORK_TYPE_WIFI; |
+ api::networking_config::NetworkInfo network_info; |
+ network_info.type = api::networking_config::NETWORK_TYPE_WIFI; |
const std::vector<uint8_t>& raw_ssid = network->raw_ssid(); |
std::string hex_ssid = |
base::HexEncode(vector_as_array(&raw_ssid), raw_ssid.size()); |
@@ -193,12 +193,11 @@ scoped_ptr<Event> NetworkingConfigService::CreatePortalDetectedEventAndDispatch( |
if (bssid) |
network_info.bssid.reset(new std::string(*bssid)); |
scoped_ptr<base::ListValue> results = |
- core_api::networking_config::OnCaptivePortalDetected::Create( |
- network_info); |
- scoped_ptr<Event> event(new Event( |
- events::NETWORKING_CONFIG_ON_CAPTIVE_PORTAL_DETECTED, |
- core_api::networking_config::OnCaptivePortalDetected::kEventName, |
- results.Pass())); |
+ api::networking_config::OnCaptivePortalDetected::Create(network_info); |
+ scoped_ptr<Event> event( |
+ new Event(events::NETWORKING_CONFIG_ON_CAPTIVE_PORTAL_DETECTED, |
+ api::networking_config::OnCaptivePortalDetected::kEventName, |
+ results.Pass())); |
return event.Pass(); |
} |