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

Unified Diff: chrome/test/base/browser_with_test_window_test.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: chrome/test/base/browser_with_test_window_test.h
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index ba85e3ff4712c396301b24756b58d21c40b05bbe..67989c246fed095f9dbefb240b5590e1d2433401 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -31,6 +31,7 @@ class GURL;
#if defined(OS_CHROMEOS)
namespace ash {
namespace test {
+class AshTestEnvironment;
class AshTestHelper;
}
}
@@ -171,6 +172,7 @@ class BrowserWithTestWindowTest : public testing::Test {
content::RenderViewHostTestEnabler rvh_test_enabler_;
#if defined(OS_CHROMEOS)
+ std::unique_ptr<ash::test::AshTestEnvironment> ash_test_environment_;
std::unique_ptr<ash::test::AshTestHelper> ash_test_helper_;
#elif defined(TOOLKIT_VIEWS)
std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_;

Powered by Google App Engine
This is Rietveld 408576698