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

Unified Diff: trunk/src/content/browser/gpu/compositor_util_browsertest.cc

Issue 23775004: Revert 221114 "Enable GPU blacklist in tests." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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: trunk/src/content/browser/gpu/compositor_util_browsertest.cc
===================================================================
--- trunk/src/content/browser/gpu/compositor_util_browsertest.cc (revision 221144)
+++ trunk/src/content/browser/gpu/compositor_util_browsertest.cc (working copy)
@@ -1,33 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/gpu/compositor_util.h"
-#include "content/test/content_browser_test.h"
-
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
-namespace content {
-
-typedef ContentBrowserTest CompositorUtilTest;
-
-// Test that threaded compositing and FCM are in the expected mode on the bots
-// for all platforms.
-IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
- enum CompositingMode {
- DISABLED,
- ENABLED,
- THREADED,
- } expected_mode = DISABLED;
-#if defined(OS_ANDROID) || defined(USE_AURA)
- expected_mode = THREADED;
-#endif
-
- EXPECT_EQ(expected_mode == ENABLED || expected_mode == THREADED,
- IsForceCompositingModeEnabled());
- EXPECT_EQ(expected_mode == THREADED, IsThreadedCompositingEnabled());
-}
-
-}
« no previous file with comments | « trunk/src/content/browser/gpu/compositor_util.cc ('k') | trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698