Skip to content

Commit

Permalink
Revert "Reland "Adds parental handoff login screen in oobe.""
Browse files Browse the repository at this point in the history
This reverts commit 27e795c.

Reason for revert: Sorry for another revert, but this is still causing flake. See https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-chrome/9353 . Specifically:
../../content/public/test/browser_test_base.cc:702: Failure
Failed
RunLoop::Run() timed out.
Stack trace:
#0 0x56324b6c5e50 base::internal::Invoker<>::Run()
#1 0x56324b623b4f base::(anonymous namespace)::OnRunLoopTimeout()
#2 0x56324b6249e3 base::internal::Invoker<>::RunOnce()
#3 0x5632492266ab base::internal::CancelableCallbackImpl<>::ForwardOnce<>()
#4 0x56324b63bc46 base::TaskAnnotator::RunTask()
#5 0x56324b64c845 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl()
chromium#6 0x56324b64c588 base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWork()
#7 0x56324b69fb29 base::MessagePumpLibevent::Run()
#8 0x56324b64cf9a base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::Run()
#9 0x56324b62363e base::RunLoop::Run()
#10 0x5632483f1f23 chromeos::EduCoexistenceLoginBrowserTest::WaitForScreenExit()
#11 0x563248402206 chromeos::ParentalHandoffScreenBrowserTest_RegularUserLogin_Test::RunTestOnMainThread()
#12 0x56324bae8dd1 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
#13 0x56324b6fff04 ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
#14 0x56324b6ff3b9 ChromeBrowserMainParts::PreMainMessageLoopRun()
#15 0x563248bf574e chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
#16 0x563249bdf3b0 content::BrowserMainLoop::PreMainMessageLoopRun()
#17 0x563249f3668a content::StartupTaskRunner::RunAllTasksNow()
#18 0x563249bde45b content::BrowserMainLoop::CreateStartupTasks()
#19 0x563249be0bba content::BrowserMainRunnerImpl::Initialize()
#20 0x563249bdcbd2 content::BrowserMain()
#21 0x56324b198740 content::RunBrowserProcessMain()
#22 0x56324b1995d1 content::ContentMainRunnerImpl::RunServiceManager()
#23 0x56324b199234 content::ContentMainRunnerImpl::Run()
#24 0x56324a5c8687 content::RunContentProcess()
#25 0x56324a5c8c16 content::ContentMain()
#26 0x56324bae8a00 content::BrowserTestBase::SetUp()
#27 0x56324b5d8620 InProcessBrowserTest::SetUp()

Original change's description:
> Reland "Adds parental handoff login screen in oobe."
>
> This is a reland of dca1afe
>
> This is an interesting failure point due to the difference between
> official builds and non official builds. In official builds, the
> Sync Consent screen is shown and it will not exit until we interact
> with it. The waiters timeout waiting for the Parental Handoff Screen
> to be shown.
>
> Original change's description:
>
> > Adds parental handoff login screen in oobe.
> >
> > The description and mock can be seen in the comments in the bug report.
> >
> > Bug: 1134567
> > Change-Id: I2ecd7c72629dc96dfbc054f747c6cb2508210709
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466618
> > Commit-Queue: Yilkal Abe <yilkal@chromium.org>
> > Reviewed-by: Aga Wronska <agawronska@chromium.org>
> > Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> > Reviewed-by: Jesse Doherty <jwd@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#819158}
>
> Bug: 1134567
> Change-Id: Id4d8c15363579799da14a3f3ed0a285e61dde5d6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489756
> Commit-Queue: Yilkal Abe <yilkal@chromium.org>
> Reviewed-by: Aga Wronska <agawronska@chromium.org>
> Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> Reviewed-by: Jesse Doherty <jwd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#820388}

TBR=jwd@chromium.org,rsorokin@chromium.org,agawronska@chromium.org,yilkal@chromium.org

Change-Id: I6febf7f06a0d5d7a072be1e50aaa9cc2a4d3c217
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1134567
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495423
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820489}
  • Loading branch information
Scott Violet authored and Commit Bot committed Oct 23, 2020
1 parent cbfdc1e commit 2156019
Show file tree
Hide file tree
Showing 27 changed files with 5 additions and 717 deletions.
11 changes: 0 additions & 11 deletions chrome/app/chromeos_strings.grdp
Expand Up @@ -954,17 +954,6 @@
Please retry. If you see this error again please contact your support representative.
</message>

<!-- Strings for parental handoff login screen -->
<message name="IDS_LOGIN_PARENTAL_HANDOFF_SCREEN_TITLE" desc="Title of screen which tells user that the parent can handoff the device to supervised user.">
Now it's <ph name="SUPERVISED_USER_NAME">$1<ex>Child 1</ex></ph>'s turn
</message>
<message name="IDS_LOGIN_PARENTAL_HANDOFF_SCREEN_SUBTITLE" desc="Subtitle of screen which tells user that the parent can handoff the device to supervised user.">
You can hand this Chromebook to <ph name="SUPERVISED_USER_NAME">$1<ex>Child 1</ex></ph>. Setup is almost done, then it's time to explore.
</message>
<message name="IDS_LOGIN_PARENTAL_HANDOFF_SCREEN_NEXT_BUTTON" desc="Next button of parental handoff screen">
Next
</message>

<!-- Strings for family link notice screen -->
<message name="IDS_LOGIN_FAMILY_LINK_NOTICE_SCREEN_TITLE" desc="Title of the screen which tells user they can add parental control later.">
Add parental controls after setup
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions chrome/browser/chromeos/BUILD.gn
Expand Up @@ -1745,8 +1745,6 @@ source_set("chromeos") {
"login/screens/network_screen.h",
"login/screens/packaged_license_screen.cc",
"login/screens/packaged_license_screen.h",
"login/screens/parental_handoff_screen.cc",
"login/screens/parental_handoff_screen.h",
"login/screens/pin_setup_screen.cc",
"login/screens/pin_setup_screen.h",
"login/screens/recommend_apps/fake_recommend_apps_fetcher.cc",
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/chromeos/login/debug_overlay_browsertest.cc
Expand Up @@ -22,8 +22,8 @@ constexpr char kDebugButton[] = "invokeDebuggerButton";
constexpr char kDebugOverlay[] = "debuggerOverlay";
constexpr char kScreensPanel[] = "DebuggerPanelScreens";

constexpr int kOobeScreensCount = 38;
constexpr int kLoginScreensCount = 33;
constexpr int kOobeScreensCount = 37;
constexpr int kLoginScreensCount = 32;

std::string ElementsInPanel(const std::string& panel) {
return base::StrCat({"$('", panel, "').children.length"});
Expand Down
109 changes: 0 additions & 109 deletions chrome/browser/chromeos/login/screens/parental_handoff_screen.cc

This file was deleted.

54 changes: 0 additions & 54 deletions chrome/browser/chromeos/login/screens/parental_handoff_screen.h

This file was deleted.

0 comments on commit 2156019

Please sign in to comment.