Add some google_style changes and remove instance address caching

3 files changed, 2 insertions, 18 deletions

diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
index dc96f19334..64d4ced21b 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
@@ -34,11 +34,6 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_EVENT_DISPATCHER_H_
 
 #include <list>
-#include <map>
-
-#include "utils/lock.h"
-#include "utils/singleton.h"
-
 #include "application_manager/event_engine/event.h"
 
 namespace application_manager {
diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
index 65023c0075..c375249ca9 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
@@ -116,8 +116,8 @@ class EventDispatcherImpl : public EventDispatcher,
   // Members section
   sync_primitives::Lock                               state_lock_;
   sync_primitives::Lock                               observer_lock_;
-  EventObserverMap                                    observers_event;
-  ObserverVector                                      observers;
+  EventObserverMap                                    observers_event_;
+  ObserverVector                                      observers_;
 
 };
 
diff --git a/src/components/application_manager/include/application_manager/event_engine/event_observer.h b/src/components/application_manager/include/application_manager/event_engine/event_observer.h
index befaabbc4a..4de9ca812f 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_observer.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_observer.h
@@ -72,15 +72,6 @@ class EventObserver
    */
   virtual void on_event(const Event& event) = 0;
 
-  /*
-   * @brief Change the default EventDispatcher
-   *
-   * @param Pointer to different EventDispatcher
-   */
-  inline void  set_event_dispatcher(EventDispatcher* event_dispatcher)
-  {
-    pEventDispatcher = event_dispatcher;
-  }
  protected:
 
   /*
@@ -110,8 +101,6 @@ class EventObserver
 
   ObserverID id_;
 
-  EventDispatcher*  pEventDispatcher;
-
   DISALLOW_COPY_AND_ASSIGN(EventObserver);
 };