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

Unified Diff: content/browser/aura/image_transport_factory_browsertest.cc

Issue 26190004: Disable ImageTransportFactoryBrowserTest.TestLostContext in software compositing mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/aura/image_transport_factory_browsertest.cc
diff --git a/content/browser/aura/image_transport_factory_browsertest.cc b/content/browser/aura/image_transport_factory_browsertest.cc
index 233c06c17390a351444f66960c2cba6aac2e6c84..d66946277ba171452e6bef685294a485f644f12e 100644
--- a/content/browser/aura/image_transport_factory_browsertest.cc
+++ b/content/browser/aura/image_transport_factory_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/run_loop.h"
#include "content/browser/aura/image_transport_factory.h"
+#include "content/public/browser/gpu_data_manager.h"
#include "content/test/content_browser_test.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -31,8 +32,13 @@ class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
// Checks that upon context loss, the observer is called and the created
// resources are reset.
IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest, TestLostContext) {
+ // This test doesn't make sense in software compositing mode.
+ if (!GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor())
+ return;
+
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
scoped_refptr<ui::Texture> texture = factory->CreateTransportClient(1.f);
+ ASSERT_TRUE(texture.get());
MockImageTransportFactoryObserver observer;
factory->AddObserver(&observer);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698