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

Unified Diff: content/public/test/test_renderer_host.cc

Issue 1845343005: Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments 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
« no previous file with comments | « content/public/test/content_test_suite_base.cc ('k') | content/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/test_renderer_host.cc
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 256c528d386b15bae61fa783845730731bff7afc..6bb7009a52b0a4af1d29206b367b352cc1a6b6b6 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -24,6 +24,8 @@
#include "content/test/test_render_view_host.h"
#include "content/test/test_render_view_host_factory.h"
#include "content/test/test_web_contents.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/test/material_design_controller_test_api.h"
#if defined(OS_WIN)
#include "ui/base/win/scoped_ole_initializer.h"
@@ -179,6 +181,10 @@ void RenderViewHostTestHarness::FailedReload() {
}
void RenderViewHostTestHarness::SetUp() {
+ // ContentTestSuiteBase might have already initialized
+ // MaterialDesignController in unit_tests suite.
+ ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+ ui::MaterialDesignController::Initialize();
thread_bundle_.reset(new TestBrowserThreadBundle(thread_bundle_options_));
#if defined(OS_WIN)
« no previous file with comments | « content/public/test/content_test_suite_base.cc ('k') | content/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698