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

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel 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
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_test_suite_base.cc
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 459c37d599301d382ed50b261857f8a71ab96ddc..5bf5b5eded1cb0668a5476cad4086ae013d39fe7 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -16,7 +16,6 @@
#include "media/base/media.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
-#include "ui/compositor/compositor_setup.h"
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
@@ -72,9 +71,6 @@ void ContentTestSuiteBase::Initialize() {
RegisterPathProvider();
ui::RegisterPathProvider();
- // Mock out the compositor on platforms that use it.
- ui::SetupTestCompositor();
-
testing::UnitTest::GetInstance()->listeners().Append(
new ContentTestSuiteBaseListener);
}
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698