Fix tests in ShelfLayoutManagerTest when MD is enable

Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a
visible height of 0 whereas the visible height is 3 for non-MD.
Updated test cases GestureDrag, SetAlignment and AutoHide to match
the new value.

BUG=623432, 623430, 623429
Committed: https://crrev.com/b7a57976c42de5959d7a45cc9133864b45cf3399
Cr-Commit-Position: refs/heads/master@{#405962}

[yiyix, 2016-07-13 02:29:06]

Description was changed from

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

BUG=623432, 623430, 623429
==========

to

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a 
visible height of 0 whereas the visible height is 3 for non-MD. 
Updated test cases GestureDrag, SetAlignment and AutoHide to match 
the new value.  

BUG=623432, 623430, 623429
==========

[yiyix, 2016-07-13 02:29:06]

yiyix@chromium.org changed reviewers:
+ bruthig@chromium.org

[yiyix, 2016-07-13 02:29:14]

The CQ bit was checked by yiyix@chromium.org to run a CQ dry run

[yiyix, 2016-07-13 02:29:54]

@bruthig, could you please take a look at this change? Thank you.

[commit-bot: I haz the power, 2016-07-13 02:31:00]

Dry run: 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-07-13 03:39:25]

The CQ bit was unchecked by commit-bot@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-07-13 03:39:26]

Dry run: This issue passed the CQ dry run.

[bruthig, 2016-07-13 19:36:51]

https://codereview.chromium.org/2143033003/diff/1/ash/shelf/shelf_layout_mana...
File ash/shelf/shelf_layout_manager_unittest.cc (right):

https://codereview.chromium.org/2143033003/diff/1/ash/shelf/shelf_layout_mana...
ash/shelf/shelf_layout_manager_unittest.cc:195: if
(GetShelf()->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
Can you collapse this 'if'/'else if' into a single if clause?

i.e.

if (!ash::MaterialDesignController::IsShelfMaterial() ||
    GetShelf()->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
  EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
}

[yiyix, 2016-07-14 18:24:49]

@bruthig, could you please take a loot at the new version? Thank you.

https://codereview.chromium.org/2143033003/diff/1/ash/shelf/shelf_layout_mana...
File ash/shelf/shelf_layout_manager_unittest.cc (right):

https://codereview.chromium.org/2143033003/diff/1/ash/shelf/shelf_layout_mana...
ash/shelf/shelf_layout_manager_unittest.cc:195: if
(GetShelf()->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
On 2016/07/13 19:36:51, bruthig wrote:
> Can you collapse this 'if'/'else if' into a single if clause?
> 
> i.e.
> 
> if (!ash::MaterialDesignController::IsShelfMaterial() ||
>     GetShelf()->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
>   EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
> }

Done.

[bruthig, 2016-07-14 21:22:51]

lgtm

[yiyix, 2016-07-14 21:57:44]

yiyix@chromium.org changed reviewers:
+ jamescook@chromium.org

[yiyix, 2016-07-14 21:57:44]

@jamescook, could you please take a look? Thank you very much.

[James Cook, 2016-07-14 22:59:14]

LGTM

https://codereview.chromium.org/2143033003/diff/20001/ash/shelf/shelf_layout_...
File ash/shelf/shelf_layout_manager_unittest.cc (right):

https://codereview.chromium.org/2143033003/diff/20001/ash/shelf/shelf_layout_...
ash/shelf/shelf_layout_manager_unittest.cc:143: :
auto_hidden_shelf_widget_bounds_(not_visible),
These names are much clearer. Thanks for changing them.

[yiyix, 2016-07-17 20:00:32]

The CQ bit was checked by yiyix@chromium.org

[commit-bot: I haz the power, 2016-07-17 20:00:37]

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-07-17 21:33:48]

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

[commit-bot: I haz the power, 2016-07-17 21:33:49]

Try jobs failed on following builders:
  win_clang on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_clang/builds/...)

[yiyix, 2016-07-18 04:29:22]

The CQ bit was checked by yiyix@chromium.org

[commit-bot: I haz the power, 2016-07-18 04:29:27]

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-07-18 08:05:43]

Description was changed from

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a 
visible height of 0 whereas the visible height is 3 for non-MD. 
Updated test cases GestureDrag, SetAlignment and AutoHide to match 
the new value.  

BUG=623432, 623430, 623429
==========

to

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a 
visible height of 0 whereas the visible height is 3 for non-MD. 
Updated test cases GestureDrag, SetAlignment and AutoHide to match 
the new value.  

BUG=623432, 623430, 623429
==========

[commit-bot: I haz the power, 2016-07-18 08:05:44]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-07-18 08:05:46]

CQ bit was unchecked.

[commit-bot: I haz the power, 2016-07-18 08:07:53]

Description was changed from

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a 
visible height of 0 whereas the visible height is 3 for non-MD. 
Updated test cases GestureDrag, SetAlignment and AutoHide to match 
the new value.  

BUG=623432, 623430, 623429
==========

to

==========
Fix tests in ShelfLayoutManagerTest when MD is enable

When ash-md is set to MATERIAL_EXPERIMENTAL by default, shelf has a
visible height of 0 whereas the visible height is 3 for non-MD.
Updated test cases GestureDrag, SetAlignment and AutoHide to match
the new value.

BUG=623432, 623430, 623429

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

[commit-bot: I haz the power, 2016-07-18 08:07:54]

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