ApplicationManager correctives after remove all singletones

	Removed singletone from AM
	Updated after removing Profile singleton

4 files changed, 178 insertions, 0 deletions

diff --git a/src/components/include/application_manager/application_manager_settings.h b/src/components/include/application_manager/application_manager_settings.h
new file mode 100644
index 0000000000..ae6f6930c1
--- /dev/null
+++ b/src/components/include/application_manager/application_manager_settings.h
@@ -0,0 +1,67 @@
+#ifndef APPLICATION_MANAGER_SETTINGS
+#define APPLICATION_MANAGER_SETTINGS
+
+#include "application_manager/request_controller_settings.h"
+
+#include <stdint.h>
+#include <string>
+
+namespace application_manager {
+class ApplicationManagerSettings : public RequestControlerSettings {
+ public:
+  virtual const uint32_t video_data_stopped_timeout() const = 0;
+  virtual const std::uint32_t audio_data_stopped_timeout() const = 0;
+  virtual const std::pair<uint32_t, int32_t>& read_did_frequency() const = 0;
+  virtual const std::pair<uint32_t, int32_t>& get_vehicle_data_frequency()
+      const = 0;
+  virtual uint32_t hash_string_size() const = 0;
+  virtual const std::string& app_storage_folder() const = 0;
+  virtual const uint32_t& app_dir_quota() const = 0;
+  virtual uint32_t stop_streaming_timeout() const = 0;
+  virtual uint32_t application_list_update_timeout() const = 0;
+  virtual uint32_t heart_beat_timeout() const = 0;
+  virtual const std::string& recording_file_name() const = 0;
+  virtual const std::string& system_files_path() const = 0;
+  virtual bool is_mixing_audio_supported() const = 0;
+  virtual uint16_t tts_global_properties_timeout() const = 0;
+  virtual uint16_t max_supported_protocol_version() const = 0;
+  virtual const uint32_t& default_timeout() const = 0;
+  virtual const uint32_t& max_cmd_id() const = 0;
+  virtual bool launch_hmi() const = 0;
+  virtual const uint32_t& delete_file_in_none() const = 0;
+  virtual const std::vector<uint32_t>& supported_diag_modes() const = 0;
+  virtual const uint32_t& list_files_in_none() const = 0;
+  virtual const std::string& tts_delimiter() const = 0;
+  virtual const uint32_t& put_file_in_none() const = 0;
+  virtual const std::string& sdl_version() const = 0;
+  virtual const std::vector<std::string>& time_out_promt() const = 0;
+  virtual const std::string& hmi_capabilities_file_name() const = 0;
+  virtual const std::string& video_server_type() const = 0;
+  virtual const std::string& audio_server_type() const = 0;
+  virtual const std::string& server_address() const = 0;
+  virtual const uint16_t video_streaming_port() const = 0;
+  virtual const uint16_t audio_streaming_port() const = 0;
+  virtual const std::string& named_video_pipe_path() const = 0;
+  virtual const std::string& named_audio_pipe_path() const = 0;
+  virtual const std::string& video_stream_file() const = 0;
+  virtual const std::string& audio_stream_file() const = 0;
+
+  virtual bool use_db_for_resumption() const = 0;
+  virtual const uint32_t& app_resumption_save_persistent_data_timeout()
+      const = 0;
+  virtual uint32_t resumption_delay_before_ign() const = 0;
+  virtual uint32_t resumption_delay_after_ign() const = 0;
+  virtual const uint32_t& app_resuming_timeout() const = 0;
+  virtual uint16_t attempts_to_open_resumption_db() const = 0;
+  virtual uint16_t open_attempt_timeout_ms_resumption_db() const = 0;
+  virtual void config_file_name(const std::string& fileName) = 0;
+  virtual const std::pair<uint32_t, int32_t>& start_stream_retry_amount()
+      const = 0;
+  virtual const std::string& app_icons_folder() const = 0;
+  virtual const uint32_t& app_icons_folder_max_size() const = 0;
+  virtual const uint32_t& app_icons_amount_to_remove() const = 0;
+  virtual const uint32_t& list_files_response_size() const = 0;
+};
+}
+
+#endif  // APPLICATION_MANAGER_SETTINGS
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index 1298350718..197a4cc0a7 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -99,6 +99,10 @@ class PolicyHandlerInterface {
   virtual utils::SharedPtr<usage_statistics::StatisticsManager>
   GetStatisticManager() const = 0;
 
+  virtual void SendOnAppPermissionsChanged(
+      const AppPermissions& permissions,
+      const std::string& policy_app_id) const = 0;
+
   /**
    * @brief CheckSystemAction allows to check whether certain system
    * action is enabled.
diff --git a/src/components/include/application_manager/request_controller_settings.h b/src/components/include/application_manager/request_controller_settings.h
new file mode 100644
index 0000000000..45871f6ca2
--- /dev/null
+++ b/src/components/include/application_manager/request_controller_settings.h
@@ -0,0 +1,15 @@
+#ifndef REQUEST_CONTROLLER_SETTINGS_H
+#define REQUEST_CONTROLLER_SETTINGS_H
+namespace application_manager {
+class RequestControlerSettings {
+public:
+  virtual uint32_t thread_pool_size() const = 0;
+  virtual const uint32_t& app_hmi_level_none_time_scale() const = 0;
+  virtual const uint32_t& app_hmi_level_none_time_scale_max_requests()
+      const = 0;
+  virtual const uint32_t& app_time_scale() const = 0;
+  virtual const uint32_t& app_time_scale_max_requests() const = 0;
+  virtual const uint32_t& pending_requests_amount() const = 0;
+};
+}
+#endif  // REQUEST_CONTROLLER_SETTINGS_H
diff --git a/src/components/include/application_manager/state_controller.h b/src/components/include/application_manager/state_controller.h
new file mode 100644
index 0000000000..9cec3eb639
--- /dev/null
+++ b/src/components/include/application_manager/state_controller.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_
+#define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_
+
+#include "stdint.h"
+#include "application_manager/request_controller_settings.h"
+#include "application_manager/application_manager.h"
+#include "application_manager/application.h"
+
+namespace application_manager {
+class StateController {
+ public:
+  virtual void SetRegularState(ApplicationSharedPtr app, HmiStatePtr state,
+                               const bool SendActivateApp) = 0;
+
+  virtual void SetRegularState(
+      ApplicationSharedPtr app, const mobile_apis::HMILevel::eType hmi_level,
+      const mobile_apis::AudioStreamingState::eType audio_state,
+      const bool SendActivateApp) = 0;
+
+  virtual void SetRegularState(ApplicationSharedPtr app,
+                               const mobile_apis::HMILevel::eType hmi_level,
+                               const bool SendActivateApp) = 0;
+  virtual void SetRegularState(
+      ApplicationSharedPtr app, const mobile_apis::HMILevel::eType hmi_level,
+      const mobile_apis::AudioStreamingState::eType audio_state,
+      const mobile_apis::SystemContext::eType system_context,
+      const bool SendActivateApp) = 0;
+
+  virtual void SetRegularState(
+      ApplicationSharedPtr app,
+      const mobile_apis::HMILevel::eType hmi_level) = 0;
+
+  virtual void SetRegularState(
+      ApplicationSharedPtr app,
+      const mobile_apis::AudioStreamingState::eType audio_state) = 0;
+
+  virtual void SetRegularState(
+      ApplicationSharedPtr app,
+      const mobile_apis::SystemContext::eType system_context) = 0;
+
+  virtual void SetRegularState(ApplicationSharedPtr app, HmiStatePtr state) = 0;
+
+  virtual void OnApplicationRegistered(
+      ApplicationSharedPtr app,
+      const mobile_apis::HMILevel::eType default_level) = 0;
+
+  virtual int64_t SendBCActivateApp(ApplicationConstSharedPtr app,
+                                    hmi_apis::Common_HMILevel::eType level,
+                                    bool send_policy_priority) = 0;
+
+  virtual void OnNaviStreamingStarted() = 0;
+  virtual void OnNaviStreamingStopped() = 0;
+  virtual void OnStateChanged(ApplicationSharedPtr app, HmiStatePtr old_state,
+                              HmiStatePtr new_state) = 0;
+
+  virtual bool IsStateActive(HmiState::StateID state_id) const = 0;
+};
+}  // namespace application_manager
+
+#endif  // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_