commit 64a80160593434d07ee1d00364bf88a56496f694
author Amin Hassani <ahassani@chromium.org> Mon Nov 09 16:58:17 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Nov 11 04:34:35 2020 +0000
tree 2f0989dd61d6a6da5d8183968cbb90b18560cdea
parent 4fec0f26e790dc63afcd5adfbc192233eb1bb0cb

update_engine: Turn on Chrome Kiosk app by default

This flag is always true in Chorme OS and android's code doesn't compile
this. So the flag can be removed and be turned on by default.

BUG=b:171829801
TEST=cros_workon_make --board reef --test

Change-Id: Ibb7423196f24793adf85ef5bfe7da7b1edef012a
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2528758
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>

update_manager/real_system_provider.h

diff --git a/update_manager/real_system_provider.h b/update_manager/real_system_provider.h
index ffa1467..91fee7f 100644
--- a/update_manager/real_system_provider.h
+++ b/update_manager/real_system_provider.h
@@ -39,13 +39,8 @@
   RealSystemProvider(
       chromeos_update_engine::SystemState* system_state,
       org::chromium::KioskAppServiceInterfaceProxyInterface* kiosk_app_proxy)
-#if USE_CHROME_KIOSK_APP
       : system_state_(system_state), kiosk_app_proxy_(kiosk_app_proxy) {
   }
-#else
-      system_state_(system_state) {
-  }
-#endif  // USE_CHROME_KIOSK_APP
 
   // Initializes the provider and returns whether it succeeded.
   bool Init();
@@ -86,9 +81,8 @@
   std::unique_ptr<Variable<base::Version>> var_chromeos_version_;
 
   chromeos_update_engine::SystemState* const system_state_;
-#if USE_CHROME_KIOSK_APP
+
   org::chromium::KioskAppServiceInterfaceProxyInterface* const kiosk_app_proxy_;
-#endif  // USE_CHROME_KIOSK_APP
 
   DISALLOW_COPY_AND_ASSIGN(RealSystemProvider);
 };