Redundant interface removed

3 files changed, 0 insertions, 39 deletions

diff --git a/src/components/functional_module/src/generic_module.cc b/src/components/functional_module/src/generic_module.cc
index 14a083ca6a..142b1ef58c 100644
--- a/src/components/functional_module/src/generic_module.cc
+++ b/src/components/functional_module/src/generic_module.cc
@@ -45,12 +45,6 @@ void GenericModule::set_service(application_manager::ServicePtr service) {
 
 void GenericModule::OnServiceStateChanged(ServiceState state) {
   state_ = state;
-
-  if (HMI_ADAPTER_INITIALIZED == state_) {
-    // We must subscribe to necessary HMI notifications
-    service_->SubscribeToHMINotification(hmi_api::on_interior_vehicle_data);
-    service_->SubscribeToHMINotification(hmi_api::on_remote_control_settings);
-  }
 }
 
 application_manager::ServicePtr GenericModule::service() {
diff --git a/src/components/functional_module/test/include/mock_service.h b/src/components/functional_module/test/include/mock_service.h
index 947896051f..53ec993db3 100644
--- a/src/components/functional_module/test/include/mock_service.h
+++ b/src/components/functional_module/test/include/mock_service.h
@@ -47,8 +47,6 @@ class MockService : public Service {
   MOCK_METHOD0(GetNextCorrelationID, uint32_t());
   MOCK_METHOD1(GetApplications,
                std::vector<ApplicationSharedPtr>(AppExtensionUID));
-  MOCK_METHOD1(SubscribeToHMINotification,
-               void(const std::string& hmi_notification));
   MOCK_METHOD2(ChangeNotifyHMILevel,
                void(ApplicationSharedPtr app,
                     mobile_apis::HMILevel::eType level));
diff --git a/src/components/functional_module/test/src/generic_module_test.cc b/src/components/functional_module/test/src/generic_module_test.cc
index b052050cdb..71d8325f6d 100644
--- a/src/components/functional_module/test/src/generic_module_test.cc
+++ b/src/components/functional_module/test/src/generic_module_test.cc
@@ -24,37 +24,6 @@ TEST(GenericModuleTest, SetService) {
   EXPECT_EQ(exp_service.get(), out_service.get());
 }
 
-TEST(GenericModuleTest, OnServiceStateChangedFail) {
-  DriverGenericModuleTest module(18);
-  MockService* mock_service = new MockService();
-  ServicePtr exp_service(mock_service);
-  module.set_service(exp_service);
-
-  EXPECT_CALL(*mock_service, SubscribeToHMINotification(_)).Times(0);
-
-  module.OnServiceStateChanged(LOWVOLTAGE);
-}
-
-TEST(GenericModuleTest, OnServiceStateChangedPass) {
-  DriverGenericModuleTest module(18);
-  MockService* mock_service = new MockService();
-  ServicePtr exp_service(mock_service);
-  module.set_service(exp_service);
-
-  EXPECT_CALL(*mock_service, SubscribeToHMINotification(_)).Times(2);
-
-  module.OnServiceStateChanged(HMI_ADAPTER_INITIALIZED);
-}
-
-TEST(GenericModuleTest, AddObserver) {
-  DriverGenericModuleTest module(18);
-  MockModuleObserver observer;
-  module.AddObserver(&observer);
-  const DriverGenericModuleTest::Observers& full = module.observers();
-  ASSERT_EQ(1u, full.size());
-  EXPECT_EQ(&observer, full[0]);
-}
-
 TEST(GenericModuleTest, RemoveObserver) {
   DriverGenericModuleTest module(18);
   MockModuleObserver* observer = new MockModuleObserver();