Rename Subject struct to ApplicationOnDevice

And more Subject structs were renamed to more descriptive name.
Also removed unused mocks.

1 files changed, 7 insertions, 9 deletions

diff --git a/src/components/policy/policy_external/test/include/policy/mock_access_remote.h b/src/components/policy/policy_external/test/include/policy/mock_access_remote.h
index 3eed880c0b..486c27590d 100644
--- a/src/components/policy/policy_external/test/include/policy/mock_access_remote.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_access_remote.h
@@ -39,22 +39,19 @@ namespace test {
 namespace components {
 namespace access_remote_test {
 
-class MockSubject : public policy::Subject {
- public:
-};
-
 class MockAccessRemote : public policy::AccessRemote {
  public:
   MOCK_CONST_METHOD3(
       FindGroup,
-      policy::PTString(const policy::Subject& who,
+      policy::PTString(const policy::ApplicationOnDevice& who,
                        const policy::PTString& rpc,
                        const policy::RemoteControlParams& params));
   MOCK_METHOD2(SetDefaultHmiTypes,
-               void(const policy::Subject& who,
+               void(const policy::ApplicationOnDevice& who,
                     const std::vector<int>& hmi_types));
-  MOCK_METHOD1(GetGroups,
-               const policy_table::Strings&(const policy::Subject& who));
+  MOCK_METHOD1(
+      GetGroups,
+      const policy_table::Strings&(const policy::ApplicationOnDevice& who));
   MOCK_METHOD3(GetPermissionsForApp,
                bool(const std::string& device_id,
                     const std::string& app_id,
@@ -62,7 +59,8 @@ class MockAccessRemote : public policy::AccessRemote {
   MOCK_CONST_METHOD2(CheckModuleType,
                      bool(const policy::PTString& app_id,
                           policy_table::ModuleType module));
-  MOCK_METHOD1(IsAppRemoteControl, bool(const policy::Subject& who));
+  MOCK_METHOD1(IsAppRemoteControl,
+               bool(const policy::ApplicationOnDevice& who));
   MOCK_METHOD2(GetModuleTypes,
                bool(const std::string& application_id,
                     std::vector<std::string>* modules));