Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / components / wifi / wifi_test.cc

diff --git a/src/components/wifi/wifi_test.cc b/src/components/wifi/wifi_test.cc
index c8875ba..0897745 100644 (file)
--- a/src/components/wifi/wifi_test.cc
+++ b/src/components/wifi/wifi_test.cc
@@ -66,6 +66,7 @@ WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) {
   if (!ParseCommandLine(argc, argv)) {
     VLOG(0) <<  "Usage: " << argv[0] <<
                 " [--list]"
+                " [--get_key]"
                 " [--get_properties]"
                 " [--create]"
                 " [--connect]"
@@ -73,7 +74,7 @@ WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) {
                 " [--network_guid=<network_guid>]"
                 " [--frequency=0|2400|5000]"
                 " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]"
-                " [--password=<wifi password>]"
+                " [--password=<wifi_password>]"
                 " [<network_guid>]\n";
     return RESULT_WRONG_USAGE;
   }
@@ -109,7 +110,7 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) {
     MessageBoxA(NULL, __FUNCTION__, "Debug Me!", MB_OK);
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
   scoped_ptr<WiFiService> wifi_service(WiFiService::Create());
 #else
   scoped_ptr<WiFiService> wifi_service(WiFiService::CreateForTest());
@@ -190,6 +191,18 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) {
     }
   }
 
+  if (parsed_command_line.HasSwitch("get_key")) {
+    if (network_guid.length() > 0) {
+      std::string error;
+      std::string key_data;
+      wifi_service->GetKeyFromSystem(network_guid,
+                                     &key_data,
+                                     &error);
+      VLOG(0) << key_data << error;
+      return true;
+    }
+  }
+
   return false;
 }