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

ash/common/material_design/material_design_controller_unittest.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 <memory>
 #include <string>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/material_design_controller_test_api.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 namespace {
 
 // Test fixture for the MaterialDesignController class.
 class MaterialDesignControllerTest : public ash::test::AshTestBase {
  public:
@@ skipping 104 matching lines @@
 // Verify an invalid command line value uses the default mode.
 TEST_F(MaterialDesignControllerTestInvalid, CommandLineValue) {
   EXPECT_EQ(test::MaterialDesignControllerTestAPI::DefaultMode() ==
                     MaterialDesignController::Mode::MATERIAL_NORMAL ||
                 test::MaterialDesignControllerTestAPI::DefaultMode() ==
                     MaterialDesignController::Mode::MATERIAL_EXPERIMENTAL,
             test::MaterialDesignControllerTestAPI::IsMaterial());
 }
 
 }  // namespace ash