Improve functionality of FakeShillProfileClient

chromeos/dbus/shill_profile_client.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_DBUS_SHILL_PROFILE_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_PROFILE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 40 matching lines @@
 
     // Adds an entry to the profile only. |entry_path| corresponds to a
     // 'service_path' and a corresponding entry will be added to
     // ShillManagerClient ServiceCompleteList. No checking or updating of
     // ShillServiceClient is performed.
     virtual void AddEntry(const std::string& profile_path,
                           const std::string& entry_path,
                           const base::DictionaryValue& properties) = 0;
 
     // Adds a service to the profile, copying properties from the
-    // ShillServiceClient entry (which must be present). Also sets the Profile
-    // property of the service in ShillServiceClient.
+    // ShillServiceClient entry. Returns false if no Service entry exists or
+    // if a Profile entry already exists. Also sets the Profile property of
+    // the service in ShillServiceClient.
     virtual bool AddService(const std::string& profile_path,
                             const std::string& service_path) = 0;
 
+    // Updates an existing profile service entry. Returns false if no entry

[pneubeck (no reviews), 2014/05/14 08:12:17]

unclear what 'Updates' means.

[stevenjb, 2014/05/14 17:08:10]

Done.

+    // exists.
+    virtual bool UpdateService(const std::string& profile_path,
+                            const std::string& service_path) = 0;
+
     // Sets |profiles| to the current list of profile paths.
     virtual void GetProfilePaths(std::vector<std::string>* profiles) = 0;
 
+    // Sets |properties| to the entry for |service_path|, sets |profile_path|
+    // to the path of the profile with the entry, and returns true if the
+    // service exists in any profile.
+    virtual bool GetService(const std::string& service_path,
+                            std::string* profile_path,
+                            base::DictionaryValue* properties) = 0;
+
+    // Remove all profile entries.
+    virtual void ClearProfiles() = 0;
+
    protected:
     virtual ~TestInterface() {}
   };
 
   virtual ~ShillProfileClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static ShillProfileClient* Create();
 
@@ skipping 40 matching lines @@
   // Create() should be used instead.
   ShillProfileClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillProfileClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_PROFILE_CLIENT_H_