Reland of "Apply Shelf/Dock opacity animations for the Material Design style."

ash/test/ash_test_helper.h

 // Copyright 2013 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.
 
 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include <memory>
 
 #include "ash/common/material_design/material_design_controller.h"
-#include "ash/test/material_design_controller_test_api.h"
+#include "ash/common/test/material_design_controller_test_api.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace base {
 class MessageLoopForUI;
 }  // namespace base
@@ skipping 91 matching lines @@
 
   std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_