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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/test_suite.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
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc » ('j') | content/public/test/browser_test_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_suite.cc
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index 02c5f2980be730f7ac264c9800576d6f6f64efc7..54c24ee2c151c9edb385dc3de6133a7f93c8bcef 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -12,7 +12,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
-#include "ui/compositor/compositor_setup.h"
#include "ui/gfx/gfx_paths.h"
#if defined(OS_MACOSX)
@@ -55,7 +54,6 @@ void AuraShellTestSuite::Initialize() {
// Force unittests to run using en-US so if we test against string
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
- ui::SetupTestCompositor();
}
void AuraShellTestSuite::Shutdown() {
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc » ('j') | content/public/test/browser_test_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698