Set Ash material design mode in tests properly

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/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 15 matching lines @@
 class TestShellDelegate;
 class TestSessionStateDelegate;
 
 // A helper class that does common initialization required for Ash. Creates a
 // root window and an ash::Shell instance with a test delegate.
 class AshTestHelper {
  public:
   explicit AshTestHelper(base::MessageLoopForUI* message_loop);
   ~AshTestHelper();
 
-  // Creates the ash::Shell and performs associated initialization.
-  // Set |start_session| to true if the user should log in before
-  // the test is run.
-  void SetUp(bool start_session);
+  // Creates the ash::Shell and performs associated initialization.  Set
+  // |start_session| to true if the user should log in before the test is run.
+  // |material_mode| determines the material design mode to be used for the
+  // tests.
+  void SetUp(bool start_session, MaterialDesignController::Mode material_mode);
 
   // Destroys the ash::Shell and performs associated cleanup.
   void TearDown();
 
   // Returns a root Window. Usually this is the active root Window, but that
   // method can return NULL sometimes, and in those cases, we fall back on the
   // primary root Window.
   aura::Window* CurrentContext();
 
   void RunAllPendingInMessageLoop();
@@ skipping 41 matching lines @@
   // |content_state_| is non-null, this will be nullptr.
   TestShellContentState* test_shell_content_state_;
 
 #if defined(OS_CHROMEOS)
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
   // Check if Bluez DBus Manager was initialized here.
   bool bluez_dbus_manager_initialized_;
 #endif
 
+  std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;

[tdanderson, 2016/07/29 15:16:50]

Can't this be owned by AshTestBase instead?

[bruthig, 2016/07/29 16:13:04]

The TestAPI Needs to be initialized after the MaterialDesignController, (or
instead of) which is currently done on line 128 in the ash_test_helper.cc and
before the Shell instance is constructed.  So if we are to move the TestAPI we
will also have to move this initialization.  I am not sure what the original
considerations were for the initializing the controller in the helper...

[mohsen, 2016/07/29 18:05:19]

I believe these initializations are in AshTestHelper rather than AshTestBase so
that they can be used in other tests that need to initialize Ash (e.g.
BrowserWithTestWindowTest).

+
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_