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>
diff --git a/Android.bp b/Android.bp
index 41eaa55..8f465f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,7 +29,6 @@
cflags: [
"-DBASE_VER=576279",
- "-DUSE_CHROME_KIOSK_APP=0",
"-DUSE_HWID_OVERRIDE=0",
"-D_FILE_OFFSET_BITS=64",
"-D_POSIX_C_SOURCE=199309L",
diff --git a/BUILD.gn b/BUILD.gn
index c5430f9..a6e4b81 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -81,7 +81,6 @@
"USE_DBUS=${use.dbus}",
"USE_FEC=0",
"USE_HWID_OVERRIDE=${use.hwid_override}",
- "USE_CHROME_KIOSK_APP=${use.chrome_kiosk_app}",
"USE_SHILL=1",
]
include_dirs = [
@@ -270,6 +269,7 @@
deps = [
":libpayload_consumer",
":update_engine-dbus-adaptor",
+ ":update_engine-dbus-kiosk-app-client",
":update_metadata-protos",
]
@@ -281,10 +281,6 @@
sources += [ "cros/chrome_browser_proxy_resolver.cc" ]
}
- if (use.chrome_kiosk_app) {
- deps += [ ":update_engine-dbus-kiosk-app-client" ]
- }
-
if (use.dlc) {
sources += [
"cros/dlcservice_chromeos.cc",
diff --git a/cros/real_system_state.cc b/cros/real_system_state.cc
index 5715a39..aff9863 100644
--- a/cros/real_system_state.cc
+++ b/cros/real_system_state.cc
@@ -25,9 +25,7 @@
#include <base/location.h>
#include <base/time/time.h>
#include <brillo/message_loops/message_loop.h>
-#if USE_CHROME_KIOSK_APP
#include <chromeos/dbus/service_constants.h>
-#endif // USE_CHROME_KIOSK_APP
#include "update_engine/common/boot_control.h"
#include "update_engine/common/boot_control_stub.h"
@@ -57,10 +55,8 @@
return false;
}
-#if USE_CHROME_KIOSK_APP
kiosk_app_proxy_.reset(new org::chromium::KioskAppServiceInterfaceProxy(
DBusConnection::Get()->GetDBus(), chromeos::kKioskAppServiceName));
-#endif // USE_CHROME_KIOSK_APP
LOG_IF(INFO, !hardware_->IsNormalBootMode()) << "Booted in dev mode.";
LOG_IF(INFO, !hardware_->IsOfficialBuild()) << "Booted non-official build.";
@@ -146,11 +142,7 @@
// Initialize the Update Manager using the default state factory.
chromeos_update_manager::State* um_state =
chromeos_update_manager::DefaultStateFactory(&policy_provider_,
-#if USE_CHROME_KIOSK_APP
kiosk_app_proxy_.get(),
-#else
- nullptr,
-#endif // USE_CHROME_KIOSK_APP
this);
if (!um_state) {
diff --git a/cros/real_system_state.h b/cros/real_system_state.h
index 644ba78..1e45dc1 100644
--- a/cros/real_system_state.h
+++ b/cros/real_system_state.h
@@ -23,10 +23,7 @@
#include <set>
#include <policy/device_policy.h>
-
-#if USE_CHROME_KIOSK_APP
#include <kiosk-app/dbus-proxies.h>
-#endif // USE_CHROME_KIOSK_APP
#include "update_engine/certificate_checker.h"
#include "update_engine/common/boot_control_interface.h"
@@ -112,10 +109,8 @@
private:
// Real DBus proxies using the DBus connection.
-#if USE_CHROME_KIOSK_APP
std::unique_ptr<org::chromium::KioskAppServiceInterfaceProxy>
kiosk_app_proxy_;
-#endif // USE_CHROME_KIOSK_APP
// Interface for the power manager.
std::unique_ptr<PowerManagerInterface> power_manager_;
diff --git a/update_manager/real_system_provider.cc b/update_manager/real_system_provider.cc
index 4e88b07..8d30f7f 100644
--- a/update_manager/real_system_provider.cc
+++ b/update_manager/real_system_provider.cc
@@ -20,9 +20,7 @@
#include <base/callback.h>
#include <base/logging.h>
#include <base/time/time.h>
-#if USE_CHROME_KIOSK_APP
#include <kiosk-app/dbus-proxies.h>
-#endif // USE_CHROME_KIOSK_APP
#include "update_engine/common/boot_control_interface.h"
#include "update_engine/common/hardware_interface.h"
@@ -129,7 +127,6 @@
bool RealSystemProvider::GetKioskAppRequiredPlatformVersion(
string* required_platform_version) {
-#if USE_CHROME_KIOSK_APP
brillo::ErrorPtr error;
if (!kiosk_app_proxy_->GetRequiredPlatformVersion(required_platform_version,
&error)) {
@@ -137,7 +134,6 @@
required_platform_version->clear();
return false;
}
-#endif // USE_CHROME_KIOSK_APP
return true;
}
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);
};
diff --git a/update_manager/real_system_provider_unittest.cc b/update_manager/real_system_provider_unittest.cc
index 8add690..3c77ac7 100644
--- a/update_manager/real_system_provider_unittest.cc
+++ b/update_manager/real_system_provider_unittest.cc
@@ -21,35 +21,30 @@
#include <base/time/time.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <kiosk-app/dbus-proxies.h>
+#include <kiosk-app/dbus-proxy-mocks.h>
#include "update_engine/common/fake_boot_control.h"
#include "update_engine/common/fake_hardware.h"
#include "update_engine/cros/fake_system_state.h"
#include "update_engine/update_manager/umtest_utils.h"
-#if USE_CHROME_KIOSK_APP
-#include "kiosk-app/dbus-proxies.h"
-#include "kiosk-app/dbus-proxy-mocks.h"
using org::chromium::KioskAppServiceInterfaceProxyMock;
-#endif // USE_CHROME_KIOSK_APP
using std::unique_ptr;
using testing::_;
using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
-#if USE_CHROME_KIOSK_APP
namespace {
const char kRequiredPlatformVersion[] = "1234.0.0";
} // namespace
-#endif // USE_CHROME_KIOSK_APP
namespace chromeos_update_manager {
class UmRealSystemProviderTest : public ::testing::Test {
protected:
void SetUp() override {
-#if USE_CHROME_KIOSK_APP
kiosk_app_proxy_mock_.reset(new KioskAppServiceInterfaceProxyMock());
ON_CALL(*kiosk_app_proxy_mock_, GetRequiredPlatformVersion(_, _, _))
.WillByDefault(
@@ -57,18 +52,13 @@
provider_.reset(new RealSystemProvider(&fake_system_state_,
kiosk_app_proxy_mock_.get()));
-#else
- provider_.reset(new RealSystemProvider(&fake_system_state, nullptr));
-#endif // USE_CHROME_KIOSK_APP
EXPECT_TRUE(provider_->Init());
}
chromeos_update_engine::FakeSystemState fake_system_state_;
unique_ptr<RealSystemProvider> provider_;
-#if USE_CHROME_KIOSK_APP
unique_ptr<KioskAppServiceInterfaceProxyMock> kiosk_app_proxy_mock_;
-#endif // USE_CHROME_KIOSK_APP
};
TEST_F(UmRealSystemProviderTest, InitTest) {
@@ -99,7 +89,6 @@
provider_->var_chromeos_version());
}
-#if USE_CHROME_KIOSK_APP
TEST_F(UmRealSystemProviderTest, KioskRequiredPlatformVersion) {
UmTestUtils::ExpectVariableHasValue(
std::string(kRequiredPlatformVersion),
@@ -145,11 +134,5 @@
UmTestUtils::ExpectVariableHasValue(
std::string(""), provider_->var_kiosk_required_platform_version());
}
-#else
-TEST_F(UmRealSystemProviderTest, KioskRequiredPlatformVersion) {
- UmTestUtils::ExpectVariableHasValue(
- std::string(), provider_->var_kiosk_required_platform_version());
-}
-#endif // USE_CHROME_KIOSK_APP
} // namespace chromeos_update_manager