Commit 25d428dd authored by Danila Kuzmin's avatar Danila Kuzmin Committed by Chromium LUCI CQ

oobe: Fix tick clock initialization in offline login

Bug: 1157315
Change-Id: I2c284c9ce47a9e679ed7cfd277da114874b0af66
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584924
Commit-Queue: Danila Kuzmin <dkuzmin@google.com>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836115}
parent 8441dd50
...@@ -210,8 +210,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineTest, PRE_AuthOffline) { ...@@ -210,8 +210,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineTest, PRE_AuthOffline) {
offline_login_test_mixin_.PrepareOfflineLogin(); offline_login_test_mixin_.PrepareOfflineLogin();
} }
// TODO(https://crbug.com/1157777): Fix failing test on linux chromeos. IN_PROC_BROWSER_TEST_F(LoginOfflineTest, AuthOffline) {
IN_PROC_BROWSER_TEST_F(LoginOfflineTest, DISABLED_AuthOffline) {
offline_login_test_mixin_.GoOffline(); offline_login_test_mixin_.GoOffline();
offline_login_test_mixin_.InitOfflineLogin(test_account_id_, offline_login_test_mixin_.InitOfflineLogin(test_account_id_,
LoginManagerTest::kPassword); LoginManagerTest::kPassword);
...@@ -222,9 +221,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineTest, DISABLED_AuthOffline) { ...@@ -222,9 +221,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineTest, DISABLED_AuthOffline) {
TestSystemTrayIsVisible(false); TestSystemTrayIsVisible(false);
} }
// TODO(https://crbug.com/1157777): Fix failing test on linux chromeos. IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest, CorrectDomainCompletion) {
IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest,
DISABLED_CorrectDomainCompletion) {
std::string domain = gaia::ExtractDomainName(managed_user_id_.GetUserEmail()); std::string domain = gaia::ExtractDomainName(managed_user_id_.GetUserEmail());
ConfigurePolicy(domain); ConfigurePolicy(domain);
...@@ -247,9 +244,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest, ...@@ -247,9 +244,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest,
TestSystemTrayIsVisible(false); TestSystemTrayIsVisible(false);
} }
// TODO(https://crbug.com/1157777): Fix failing test on linux chromeos-dbg bot. IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest, FullEmailDontMatchProvided) {
IN_PROC_BROWSER_TEST_F(LoginOfflineManagedTest,
DISABLED_FullEmailDontMatchProvided) {
ConfigurePolicy("another.domain"); ConfigurePolicy("another.domain");
OobeScreenWaiter(GaiaView::kScreenId).Wait(); OobeScreenWaiter(GaiaView::kScreenId).Wait();
......
...@@ -154,8 +154,8 @@ void OfflineLoginScreen::StartIdleDetection() { ...@@ -154,8 +154,8 @@ void OfflineLoginScreen::StartIdleDetection() {
if (!idle_detector_) { if (!idle_detector_) {
auto callback = base::BindRepeating(&OfflineLoginScreen::OnIdle, auto callback = base::BindRepeating(&OfflineLoginScreen::OnIdle,
weak_ptr_factory_.GetWeakPtr()); weak_ptr_factory_.GetWeakPtr());
idle_detector_ = idle_detector_ = std::make_unique<IdleDetector>(std::move(callback),
std::make_unique<IdleDetector>(std::move(callback), tick_clock_); nullptr /* tick_clock */);
} }
idle_detector_->Start(kIdleTimeDelta); idle_detector_->Start(kIdleTimeDelta);
} }
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/scoped_observation.h" #include "base/scoped_observation.h"
#include "base/time/tick_clock.h"
#include "chrome/browser/chromeos/idle_detector.h" #include "chrome/browser/chromeos/idle_detector.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
...@@ -76,8 +75,6 @@ class OfflineLoginScreen ...@@ -76,8 +75,6 @@ class OfflineLoginScreen
ScreenExitCallback exit_callback_; ScreenExitCallback exit_callback_;
const base::TickClock* tick_clock_;
// Will monitor if the user is idle for a long period of time and we can try // Will monitor if the user is idle for a long period of time and we can try
// to get back to Online Gaia. // to get back to Online Gaia.
std::unique_ptr<IdleDetector> idle_detector_; std::unique_ptr<IdleDetector> idle_detector_;
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
</gaia-signin-element> </gaia-signin-element>
<offline-ad-login-element id="offline-ad-login" class="step hidden" hidden> <offline-ad-login-element id="offline-ad-login" class="step hidden" hidden>
</offline-ad-login-element> </offline-ad-login-element>
<offline-login id="offline-login" class="step hidden" hidden></offline-login>
<tpm-error-message-element id="tpm-error-message" class="step hidden" hidden> <tpm-error-message-element id="tpm-error-message" class="step hidden" hidden>
</tpm-error-message-element> </tpm-error-message-element>
<wrong-hwid-element id="wrong-hwid" class="step hidden" hidden> <wrong-hwid-element id="wrong-hwid" class="step hidden" hidden>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment