Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2263)

Unified Diff: ash/test/ash_test_helper.h

Issue 2186363002: Set Ash material design mode in tests properly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c54af48e80802b8c87df474fed3ae657ef4c4850 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -7,6 +7,7 @@
#include <memory>
+#include "ash/test/material_design_controller_test_api.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
@@ -42,10 +43,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 +109,8 @@ class AshTestHelper {
bool bluez_dbus_manager_initialized_;
#endif
+ std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
+
DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
};

Powered by Google App Engine
This is Rietveld 408576698