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

Unified Diff: ash/mus/test/wm_test_helper.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: Created 3 years, 10 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/mus/test/wm_test_helper.cc
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index 8bfb0e4f60cfb65207d940597087477b0e8db32a..34fb1750f32854e454c6a596ba0a9e0b03f6e88f 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -4,8 +4,6 @@
#include "ash/mus/test/wm_test_helper.h"
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/test/material_design_controller_test_api.h"
#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/test/wm_shell_test_api.h"
#include "ash/common/wm_shell.h"
@@ -82,13 +80,11 @@ WmTestHelper::~WmTestHelper() {
blocking_pool_owner_.reset();
base::RunLoop().RunUntilIdle();
- ash::test::MaterialDesignControllerTestAPI::Uninitialize();
ui::test::MaterialDesignControllerTestAPI::Uninitialize();
}
void WmTestHelper::Init() {
ui::MaterialDesignController::Initialize();
- ash::MaterialDesignController::Initialize();
views_delegate_ = base::MakeUnique<views::TestViewsDelegate>();

Powered by Google App Engine
This is Rietveld 408576698