[shill] Make wifi classes store mode as a string

Also, use flimflam nomenclature (managed,adhoc).

BUG=chromium-os:17744
TEST=unit

Change-Id: If4722525065f58a82b65bdd6adab34d97408bd67
Reviewed-on: http://gerrit.chromium.org/gerrit/6399
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/wifi_service.h b/wifi_service.h
index e785a3f..bb89453 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -26,12 +26,12 @@
               Manager *manager,
               const WiFiRefPtr &device,
               const std::vector<uint8_t> ssid,
-              uint32_t mode,
+              const std::string &mode,
               const std::string &key_management);
   ~WiFiService();
   void Connect();
   void Disconnect();
-  uint32_t mode() const;
+  const std::string &mode() const;
   const std::string &key_management() const;
   const std::vector<uint8_t> &ssid() const;
 
@@ -51,6 +51,7 @@
   const std::string type_;
   // TODO(cmasone): see if the below can be pulled from the endpoint associated
   // with this service instead.
+  const std::string mode_;
   std::string auth_mode_;
   bool hidden_ssid_;
   uint16 frequency_;
@@ -60,7 +61,6 @@
   ScopedRunnableMethodFactory<WiFiService> task_factory_;
   WiFiRefPtr wifi_;
   const std::vector<uint8_t> ssid_;
-  const uint32_t mode_;
   DISALLOW_COPY_AND_ASSIGN(WiFiService);
 };