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

Unified Diff: ash/test/ash_test_base.h

Issue 2296973002: Moves ash content specific tests into ash_content_unittests (Closed)
Patch Set: remove GetMessageLoop and merge Created 4 years, 4 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/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 63e1cf8fe979763e0bb6ccdecb77bf8134244dcc..8e11877c3363689b984cff198d7c860053a0e68f 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -15,7 +15,6 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/thread.h"
-#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/display/display.h"
@@ -53,12 +52,10 @@ class WmShelf;
namespace test {
+class AshTestEnvironment;
class AshTestHelper;
class TestScreenshotDelegate;
class TestSystemTrayDelegate;
-#if defined(OS_WIN)
-class TestMetroViewerProcessHost;
-#endif
class AshTestBase : public testing::Test {
public:
@@ -179,7 +176,7 @@ class AshTestBase : public testing::Test {
// |SetUp()| doesn't activate session if this is set to false.
bool start_session_;
MaterialDesignController::Mode material_mode_;
- std::unique_ptr<content::TestBrowserThreadBundle> thread_bundle_;
+ std::unique_ptr<AshTestEnvironment> ash_test_environment_;
std::unique_ptr<AshTestHelper> ash_test_helper_;
std::unique_ptr<ui::test::EventGenerator> event_generator_;
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698