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

Unified Diff: ash/test/ash_test_helper.h

Issue 2642113004: chromeos: Remove OS_WIN and OS_CHROMEOS ifdefs from ash/test (Closed)
Patch Set: Created 3 years, 11 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_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 9c13eddfeb8e75a1d2ade30f2c86d5a31313849e..73086777eacc0d3048534be9a4972d95a48916da 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -85,12 +85,10 @@ class AshTestHelper {
std::unique_ptr<::wm::WMState> wm_state_;
std::unique_ptr<AshTestViewsDelegate> views_delegate_;
-#if defined(OS_CHROMEOS)
// Check if DBus Thread Manager was initialized here.
bool dbus_thread_manager_initialized_;
// Check if Bluez DBus Manager was initialized here.
bool bluez_dbus_manager_initialized_;
-#endif
std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;

Powered by Google App Engine
This is Rietveld 408576698