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

Unified Diff: chrome/test/ui/ui_test.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 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/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 3dd22632383cd0502a059fcc863c36af61befd2d..5e0e248bbe32e7ff56a32f97f34ab6280228dba0 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -58,10 +58,6 @@
#include "base/win/windows_version.h"
#endif
-#if defined(USE_AURA)
-#include "ui/compositor/compositor_switches.h"
-#endif
-
using base::Time;
using base::TimeDelta;
using base::TimeTicks;
@@ -208,12 +204,6 @@ void UITestBase::SetLaunchSwitches() {
}
if (!test_name_.empty())
launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);
-#if defined(USE_AURA)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableTestCompositor)) {
- launch_arguments_.AppendSwitch(switches::kTestCompositor);
- }
-#endif
}
void UITestBase::SetUpProfile() {

Powered by Google App Engine
This is Rietveld 408576698