Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / geolocation / wifi_data_provider_linux.cc

diff --git a/src/content/browser/geolocation/wifi_data_provider_linux.cc b/src/content/browser/geolocation/wifi_data_provider_linux.cc
index 1e43658..af579ae 100644 (file)
--- a/src/content/browser/geolocation/wifi_data_provider_linux.cc
+++ b/src/content/browser/geolocation/wifi_data_provider_linux.cc
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/browser/geolocation/wifi_data_provider_manager.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ -246,7 +247,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter(
                      << ": " << response->ToString();
         continue;
       }
-      uint8* ssid_bytes = NULL;
+      const uint8* ssid_bytes = NULL;
       size_t ssid_length = 0;
       if (!variant_reader.PopArrayOfBytes(&ssid_bytes, &ssid_length)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
@@ -344,7 +345,7 @@ scoped_ptr<dbus::Response> NetworkManagerWlanApi::GetAccessPointProperty(
 }  // namespace
 
 // static
-WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
+WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() {
   return new WifiDataProviderLinux();
 }