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

Unified Diff: ui/aura/test/aura_test_base.cc

Issue 1878943002: Revert of Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 0201d67175c55758db28ce76c43d0c98b5a40c72..7cbe9ac9870c8e82c5e370c29537d05dc3e6ce3c 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -9,8 +9,6 @@
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
#include "ui/base/ime/input_method_initializer.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/test/material_design_controller_test_api.h"
#include "ui/compositor/test/context_factories_for_test.h"
#include "ui/events/event_dispatcher.h"
#include "ui/events/event_processor.h"
@@ -34,10 +32,6 @@
void AuraTestBase::SetUp() {
setup_called_ = true;
testing::Test::SetUp();
- // ContentTestSuiteBase might have already initialized
- // MaterialDesignController in unit_tests suite.
- ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
- ui::MaterialDesignController::Initialize();
ui::InitializeInputMethodForTesting();
ui::GestureConfiguration* gesture_config =
ui::GestureConfiguration::GetInstance();
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | ui/base/material_design/material_design_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698