Revert "Speculative revert of "- Move test cases for more natural ordering.""

Revert "Speculative revert of "- Move test cases for more natural ordering.""

Did not resolve the build bot issue.

This reverts commit 02d283a6ff5364d94aa88f5f5df4cfd3a5411346.

BUG=
TBR=solenberg@webrtc.org

Committed: https://crrev.com/658910cc3cb54705672c28fffedba4e982fa3989
Cr-Commit-Position: refs/heads/master@{#9849}

[stefan-webrtc, 2015-09-02 07:03:06]

The CQ bit was checked by stefan@webrtc.org

[commit-bot: I haz the power, 2015-09-02 07:03:12]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1324123002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1324123002/1

[commit-bot: I haz the power, 2015-09-02 13:03:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-02 13:03:21]

Try jobs failed on following builders:
  win_x64_rel on tryserver.webrtc (JOB_TIMED_OUT,
http://build.chromium.org/p/tryserver.webrtc/builders/win_x64_rel/builds/9123)

[stefan-webrtc, 2015-09-03 08:52:21]

The CQ bit was checked by stefan@webrtc.org

[commit-bot: I haz the power, 2015-09-03 08:52:24]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1324123002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1324123002/1

[commit-bot: I haz the power, 2015-09-03 12:48:37]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-09-03 12:48:45]

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

[the sun, 2015-09-03 20:39:35]

lgtm