Index: chromeos/dbus/fake_shill_profile_client.h |
diff --git a/chromeos/dbus/fake_shill_profile_client.h b/chromeos/dbus/fake_shill_profile_client.h |
index a28c7e4aa287bee512b30813ecc9e2196a871501..26c3cbd76a499f8b676bd16f024a43842e3355ae 100644 |
--- a/chromeos/dbus/fake_shill_profile_client.h |
+++ b/chromeos/dbus/fake_shill_profile_client.h |
@@ -5,9 +5,9 @@ |
#ifndef CHROMEOS_DBUS_FAKE_SHILL_PROFILE_CLIENT_H_ |
#define CHROMEOS_DBUS_FAKE_SHILL_PROFILE_CLIENT_H_ |
-#include <map> |
#include <memory> |
#include <string> |
+#include <vector> |
#include "base/macros.h" |
#include "chromeos/chromeos_export.h" |
@@ -56,6 +56,9 @@ class CHROMEOS_EXPORT FakeShillProfileClient : |
bool UpdateService(const std::string& profile_path, |
const std::string& service_path) override; |
void GetProfilePaths(std::vector<std::string>* profiles) override; |
+ void GetProfilePathsContainingService( |
+ const std::string& service_path, |
+ std::vector<std::string>* profiles) override; |
bool GetService(const std::string& service_path, |
std::string* profile_path, |
base::DictionaryValue* properties) override; |
@@ -63,7 +66,6 @@ class CHROMEOS_EXPORT FakeShillProfileClient : |
private: |
struct ProfileProperties; |
- using ProfileMap = std::map<std::string, std::unique_ptr<ProfileProperties>>; |
bool AddOrUpdateServiceImpl(const std::string& profile_path, |
const std::string& service_path, |
@@ -72,7 +74,15 @@ class CHROMEOS_EXPORT FakeShillProfileClient : |
ProfileProperties* GetProfile(const dbus::ObjectPath& profile_path, |
const ErrorCallback& error_callback); |
- ProfileMap profiles_; |
+ bool GetServiceDataFromProfile(const ProfileProperties* profile, |
+ const std::string& service_path, |
+ base::DictionaryValue* properties); |
+ |
+ // List of profiles known to the client in order they were added, and in the |
+ // reverse order of priority. |
+ // |AddProfile| will encure that shared profile is never added after a user |
+ // profile. |
+ std::vector<std::unique_ptr<ProfileProperties>> profiles_; |
DISALLOW_COPY_AND_ASSIGN(FakeShillProfileClient); |
}; |