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

Unified Diff: content/browser/gpu/gpu_ipc_browsertests.cc

Issue 2686243002: content/ui[Android]: Remove ContextProviderFactory. (Closed)
Patch Set: more rebase Created 3 years, 10 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/gpu/gpu_ipc_browsertests.cc
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc
index f47363c85265d7569a1c67bd6db387aad370903e..367ed032f9ef30f415d1891a739e50a2ac24874a 100644
--- a/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -183,25 +183,6 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, MAYBE_Basic) {
EXPECT_TRUE(GetGpuChannel() != NULL);
}
-// Test fails on Chromeos + Mac, flaky on Windows because UI Compositor
-// establishes a GPU channel.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#define MAYBE_EstablishAndTerminate EstablishAndTerminate
-#else
-#define MAYBE_EstablishAndTerminate DISABLED_EstablishAndTerminate
-#endif
-IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
- MAYBE_EstablishAndTerminate) {
- DCHECK(!IsChannelEstablished());
- base::RunLoop run_loop;
- GetFactory()->EstablishGpuChannel(
- base::Bind(&OnEstablishedGpuChannel, run_loop.QuitClosure(), nullptr));
- GetFactory()->Terminate();
-
- // The callback should still trigger.
- run_loop.Run();
-}
-
#if !defined(OS_ANDROID)
// Test fails on Chromeos + Mac, flaky on Windows because UI Compositor
// establishes a GPU channel.
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/browser/renderer_host/compositor_impl_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698