commit 58e5caba465ed043525f5b88e1b165e6aea349a9
author Nikita Kostylev <nkostylev@chromium.org> Tue Apr 28 11:50:44 2015
committer Nikita Kostylev <nkostylev@chromium.org> Tue Apr 28 11:51:27 2015
tree 86028b2b2d820d90fe4ff905acca37f11ed63679
parent 7cec497feff0d8fa0de1fc59271a29f3a0f3f043

Merge M43: Fix crash on Enrollment screen.

This is a sequel to crbug/470977, with a similar cause. This time, crash
is induced by WizardController re-creation, so the old NetworkErrorModel
pointers become invalid. Lesson learned: WizardController should NOT be
the owner of an ErrorScreen instance.

BUG=479666

Review URL: https://codereview.chromium.org/1098303002

Cr-Commit-Position: refs/heads/master@{#326317}
(cherry picked from commit 97422a9583d83ea837f889a2e23adb157092f9ae)

Review URL: https://codereview.chromium.org/1107363002

Cr-Commit-Position: refs/branch-heads/2357@{#247}
Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860}