Fix tests in when MD is set to EXPERIMENTAL by default

ash/test/ash_md_test_base.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_md_test_base.h"
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/test/material_design_controller_test_api.h"
 
 namespace ash {
 namespace test {
 
 AshMDTestBase::AshMDTestBase() {}
 
 AshMDTestBase::~AshMDTestBase() {}
 
 void AshMDTestBase::SetUp() {
   AshTestBase::SetUp();
 
+  // initialize md_maximized_window_height_offset_
   material_design_state_.reset(new test::MaterialDesignControllerTestAPI(
       MaterialDesignController::Mode::NON_MATERIAL));
   const int non_md_shelf_size = GetShelfConstant(SHELF_SIZE);
 
   material_design_state_.reset(
       new test::MaterialDesignControllerTestAPI(GetParam()));
   const int md_state_shelf_size = GetShelfConstant(SHELF_SIZE);
 
   md_maximized_window_height_offset_ = non_md_shelf_size - md_state_shelf_size;
+
+  // initialize md_auto_hidden_shelf_height_offset_
+  material_design_state_.reset(new test::MaterialDesignControllerTestAPI(
+      MaterialDesignController::Mode::NON_MATERIAL));
+  const int non_md_auto_hide_shelf_size =

[tdanderson, 2016/07/19 21:10:23]

I think you should be able to:

* Move line 34 to be after line 23,
* Move line 39 to be after line 27,
* Delete line 32, and
* Delete line 37.

If so, then omit the comments on lines 20 and 31.

[yiyix, 2016/07/20 06:03:07]

It works. We need to reset material_design_state less often this way.

+      GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
+
+  material_design_state_.reset(
+      new test::MaterialDesignControllerTestAPI(GetParam()));
+  const int md_state_auto_hide_shelf_size =
+      GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
+
+  md_auto_hidden_shelf_height_offset_ =
+      non_md_auto_hide_shelf_size - md_state_auto_hide_shelf_size;
 }
 
 void AshMDTestBase::TearDown() {
   material_design_state_.reset();
   AshTestBase::TearDown();
 }
 
 int AshMDTestBase::GetMdMaximizedWindowHeightOffset() {
   return md_maximized_window_height_offset_;
 }
 
+int AshMDTestBase::GetMdAutoHiddenShelfHeightOffset() {
+  return md_auto_hidden_shelf_height_offset_;
+}
+
 }  // namespace test
 }  // namespace ash