Set Ash material design mode in tests properly

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 345d8273c5a2e11ba0bf2ed9d01b3d78dc9edc10..028194c0a6a688507a5048c1e0e47bc8017a1500 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -7,6 +7,8 @@
 
 #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"
 
@@ -42,10 +44,11 @@ class AshTestHelper {
   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();
@@ -107,6 +110,8 @@ class AshTestHelper {
   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);
 };