Revert of Some more pre-material cleanups

Revert of Some more pre-material cleanups (patchset #4 id:60001 of https://codereview.chromium.org/2444923003/ )

Reason for revert:
Speculative revert since being the only commit in the first of a long series of flaky failures in interactive_ui_tests on Mac10.10 Tests: https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests/builds/8428

Original issue's description:
> Some more pre-material cleanups
>
> BUG=648281
>
> Committed: https://crrev.com/3d5fe31add4e90541a5164216f9a16b6cf0c7086
> Cr-Commit-Position: refs/heads/master@{#428603}

TBR=groby@chromium.org,pkasting@chromium.org,sadrul@chromium.org,estade@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=648281
Committed: https://crrev.com/b828ed6e000cbe757ca8f1aa2da2bfa3c42b960a
Cr-Commit-Position: refs/heads/master@{#428969}

[kjellander_chromium, 2016-11-01 09:23:50]

The CQ bit was checked by kjellander@chromium.org

[kjellander_chromium, 2016-11-01 09:23:50]

Created Revert of Some more pre-material cleanups

[commit-bot: I haz the power, 2016-11-01 09:24:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-01 10:18:51]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-11-01 10:21:42]

Description was changed from

==========
Revert of Some more pre-material cleanups (patchset #4 id:60001 of
https://codereview.chromium.org/2444923003/ )

Reason for revert:
Speculative revert since being the only commit in the first of a long series of
flaky failures in interactive_ui_tests on Mac10.10 Tests:
https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests/builds/8428

Original issue's description:
> Some more pre-material cleanups
> 
> BUG=648281
> 
> Committed: https://crrev.com/3d5fe31add4e90541a5164216f9a16b6cf0c7086
> Cr-Commit-Position: refs/heads/master@{#428603}

TBR=groby@chromium.org,pkasting@chromium.org,sadrul@chromium.org,estade@chrom...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=648281
==========

to

==========
Revert of Some more pre-material cleanups (patchset #4 id:60001 of
https://codereview.chromium.org/2444923003/ )

Reason for revert:
Speculative revert since being the only commit in the first of a long series of
flaky failures in interactive_ui_tests on Mac10.10 Tests:
https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests/builds/8428

Original issue's description:
> Some more pre-material cleanups
>
> BUG=648281
>
> Committed: https://crrev.com/3d5fe31add4e90541a5164216f9a16b6cf0c7086
> Cr-Commit-Position: refs/heads/master@{#428603}

TBR=groby@chromium.org,pkasting@chromium.org,sadrul@chromium.org,estade@chrom...
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=648281

Committed: https://crrev.com/b828ed6e000cbe757ca8f1aa2da2bfa3c42b960a
Cr-Commit-Position: refs/heads/master@{#428969}
==========

[commit-bot: I haz the power, 2016-11-01 10:21:43]

Patchset 1 (id:??) landed as
https://crrev.com/b828ed6e000cbe757ca8f1aa2da2bfa3c42b960a
Cr-Commit-Position: refs/heads/master@{#428969}

[kjellander_chromium, 2016-11-01 13:30:17]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2466343002/ by kjellander@chromium.org.

The reason for reverting is: Relanding as newer builds experienced the same
flakiness:
https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests/builds/8533.