Use GUID instead of ServicePath in networkingPrivate API

chromeos/dbus/fake_shill_service_client.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 "chromeos/dbus/fake_shill_service_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 291 matching lines @@
 }
 
 // ShillServiceClient::TestInterface overrides.
 
 void FakeShillServiceClient::AddService(const std::string& service_path,
                                         const std::string& name,
                                         const std::string& type,
                                         const std::string& state,
                                         bool add_to_visible_list,
                                         bool add_to_watch_list) {
-  AddServiceWithIPConfig(service_path, name, type, state, "",
+  AddServiceWithIPConfig(service_path, "" /* guid */, name,
+                         type, state, "" /* ipconfig_path */,
                          add_to_visible_list, add_to_watch_list);
 }
 
 void FakeShillServiceClient::AddServiceWithIPConfig(
     const std::string& service_path,
+    const std::string& guid,
     const std::string& name,
     const std::string& type,
     const std::string& state,
     const std::string& ipconfig_path,
     bool add_to_visible_list,
     bool add_to_watch_list) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddManagerService(service_path, add_to_visible_list, add_to_watch_list);
   std::string device_path =
       DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()->
       GetDevicePathForType(type);
 
   base::DictionaryValue* properties =
       GetModifiableServiceProperties(service_path, true);
   connect_behavior_.erase(service_path);
+  if (!guid.empty()) {
+    // If |guid| is not provided, leave it blank. Shill does not enforce a
+    // valid guid, we do that at the NetworkStateHandler layer.
+    properties->SetWithoutPathExpansion(
+        shill::kGuidProperty,
+        base::Value::CreateStringValue(guid));

[pneubeck (no reviews), 2014/05/12 13:37:07]

optional nit: CreateStringValue is deprecated, use 'new base::StringValue(..)'
instead.

(optional since we use it all over the place here)

[stevenjb, 2014/05/13 01:19:00]

Fixed throughout this file (not too many).

+  }
   shill_property_util::SetSSID(name, properties);
   properties->SetWithoutPathExpansion(
       shill::kNameProperty,
       base::Value::CreateStringValue(name));
   properties->SetWithoutPathExpansion(
       shill::kDeviceProperty,
       base::Value::CreateStringValue(device_path));
   properties->SetWithoutPathExpansion(
       shill::kTypeProperty,
       base::Value::CreateStringValue(type));
@@ skipping 214 matching lines @@
             base::StringValue(shill::kErrorBadPassphrase)));
   } else {
     // Set Online.
     SetServiceProperty(service_path,
                        shill::kStateProperty,
                        base::StringValue(shill::kStateOnline));
   }
 }
 
 }  // namespace chromeos