Use GUID instead of ServicePath in networkingPrivate API

components/wifi/fake_wifi_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/wifi/fake_wifi_service.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "components/onc/onc_constants.h"
@@ skipping 51 matching lines @@
 }
 
 void FakeWiFiService::UnInitialize() {
 }
 
 void FakeWiFiService::GetProperties(const std::string& network_guid,
                                     base::DictionaryValue* properties,
                                     std::string* error) {
   WiFiService::NetworkList::iterator network_properties =
       FindNetwork(network_guid);
-  if (network_properties != networks_.end()) {
-    properties->Swap(network_properties->ToValue(false).get());
-  } else {
-    *error = "Error.DBusFailed";
+  if (network_properties == networks_.end()) {
+    *error = "Error.InvalidNetworkGuid";
+    return;
   }
+  properties->Swap(network_properties->ToValue(false).get());
 }
 
 void FakeWiFiService::GetManagedProperties(
     const std::string& network_guid,
     base::DictionaryValue* managed_properties,
     std::string* error) {
   // Not implemented
   *error = kErrorWiFiService;
 }
 
 void FakeWiFiService::GetState(const std::string& network_guid,
                                base::DictionaryValue* properties,
                                std::string* error) {
   WiFiService::NetworkList::iterator network_properties =
       FindNetwork(network_guid);
   if (network_properties == networks_.end()) {
-    *error = "Error.InvalidParameter";
+    *error = "Error.InvalidNetworkGuid";
     return;
   }
   properties->Swap(network_properties->ToValue(true).get());
 }
 
 void FakeWiFiService::SetProperties(
     const std::string& network_guid,
     scoped_ptr<base::DictionaryValue> properties,
     std::string* error) {
   WiFiService::NetworkList::iterator network_properties =
@@ skipping 32 matching lines @@
   }
 }
 
 void FakeWiFiService::RequestNetworkScan() {
   NotifyNetworkListChanged(networks_);
 }
 
 void FakeWiFiService::StartConnect(const std::string& network_guid,
                                    std::string* error) {
   NetworkList::iterator network_properties = FindNetwork(network_guid);
-  if (network_properties != networks_.end()) {
-    DisconnectAllNetworksOfType(network_properties->type);
-    network_properties->connection_state = onc::connection_state::kConnected;
-    SortNetworks();
-    NotifyNetworkListChanged(networks_);
-    NotifyNetworkChanged(network_guid);
-  } else {
-    *error = "configure-failed";
+  if (network_properties == networks_.end()) {
+    *error = "Error.InvalidNetworkGuid";
+    return;
   }
+  DisconnectAllNetworksOfType(network_properties->type);
+  network_properties->connection_state = onc::connection_state::kConnected;
+  SortNetworks();
+  NotifyNetworkListChanged(networks_);
+  NotifyNetworkChanged(network_guid);
 }
 
 void FakeWiFiService::StartDisconnect(const std::string& network_guid,
                                       std::string* error) {
   WiFiService::NetworkList::iterator network_properties =
       FindNetwork(network_guid);
-  if (network_properties != networks_.end()) {
-    network_properties->connection_state = onc::connection_state::kNotConnected;
-    SortNetworks();
-    NotifyNetworkListChanged(networks_);
-    NotifyNetworkChanged(network_guid);
-  } else {
-    *error = "not-found";
+  if (network_properties == networks_.end()) {
+    *error = "Error.InvalidNetworkGuid";
+    return;
   }
+  network_properties->connection_state = onc::connection_state::kNotConnected;
+  SortNetworks();
+  NotifyNetworkListChanged(networks_);
+  NotifyNetworkChanged(network_guid);
 }
 
 void FakeWiFiService::GetKeyFromSystem(const std::string& network_guid,
                                        std::string* key_data,
                                        std::string* error) {
   *error = "not-found";
 }
 
 void FakeWiFiService::SetEventObservers(
     scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
@@ skipping 46 matching lines @@
       FROM_HERE, base::Bind(network_list_changed_observer_, current_networks));
 }
 
 void FakeWiFiService::NotifyNetworkChanged(const std::string& network_guid) {
   WiFiService::NetworkGuidList changed_networks(1, network_guid);
   message_loop_proxy_->PostTask(
       FROM_HERE, base::Bind(networks_changed_observer_, changed_networks));
 }
 
 }  // namespace wifi