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

Unified Diff: ash/test/ash_test_suite.h

Issue 2788463003: Adds ability for ash_unittests to run in mushrome mode (Closed)
Patch Set: feedback Created 3 years, 9 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 | « ash/test/ash_test_helper.cc ('k') | ash/test/ash_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_suite.h
diff --git a/ash/test/ash_test_suite.h b/ash/test/ash_test_suite.h
index feb5e985723a447678c3bc079dfd77bcf8ba6d13..d42ec0ed0d5245881213daba0060fd341e72a968 100644
--- a/ash/test/ash_test_suite.h
+++ b/ash/test/ash_test_suite.h
@@ -12,6 +12,10 @@
#include "base/test/test_suite.h"
#include "ui/aura/env.h"
+namespace ui {
+class FakeContextFactory;
+}
+
namespace ash {
namespace test {
@@ -30,6 +34,10 @@ class AshTestSuite : public base::TestSuite {
base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
+ // Only used when running in Config::MUS, and is set as the context_factory
+ // on aura::Env.
+ std::unique_ptr<ui::FakeContextFactory> context_factory_;
+
DISALLOW_COPY_AND_ASSIGN(AshTestSuite);
};
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/test/ash_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698