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

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: Created 7 years, 5 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: content/browser/renderer_host/render_widget_host_view_browsertest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 25dd8ce884201c0d7c8b1c8f2ade77a3cfa097ca..056b2b9d5cd6dbc0aa41eb0c69544c3f598ba318 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -27,7 +27,6 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkDevice.h"
#include "ui/base/ui_base_switches.h"
-#include "ui/compositor/compositor_setup.h"
#include "ui/gfx/size_conversions.h"
#include "ui/gl/gl_switches.h"
@@ -405,15 +404,6 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,
"supported on this platform.");
return;
}
-#if defined(USE_AURA)
- if (ui::IsTestCompositorEnabled()) {
- LOG(WARNING) << ("Blindly passing this test: Aura test compositor doesn't "
- "support frame subscription.");
- // TODO(miu): Aura test compositor should support frame subscription for
- // testing. http://crbug.com/240572
- return;
- }
-#endif
base::RunLoop run_loop;
scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber(
@@ -478,7 +468,9 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
test_url_("data:text/html,<!doctype html>") {}
virtual void SetUp() OVERRIDE {
- ui::DisableTestCompositor();
+ // We expect real pixel output for these tests.
+ DoNotUseTestContexts();
+
CompositingRenderWidgetHostViewBrowserTest::SetUp();
}

Powered by Google App Engine
This is Rietveld 408576698