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

Unified Diff: content/public/test/browser_test_base.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 | « chrome/service/service_process.cc ('k') | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 7b7513aabb472ba4d9075127381132ea4323aed3..d6bb6671bac970b37fcdf5b2bd5982d28e4f0fc7 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -30,6 +30,7 @@
#include "net/base/network_interfaces.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/base/test/material_design_controller_test_api.h"
#include "ui/compositor/compositor_switches.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_switches.h"
@@ -179,6 +180,10 @@ BrowserTestBase::~BrowserTestBase() {
void BrowserTestBase::SetUp() {
set_up_called_ = true;
+ // ContentTestSuiteBase might have already initialized
+ // MaterialDesignController in browser_tests suite.
+ // Uninitialize here to let the browser process do it.
+ ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
« no previous file with comments | « chrome/service/service_process.cc ('k') | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698