Index: chrome/test/gpu/gpu_feature_browsertest.cc |
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc |
index 09fc1e24dcbe1f410b071dc952df928b44407cdf..707f199c51c5488bc14a2b864f2196e5a977e9ce 100644 |
--- a/chrome/test/gpu/gpu_feature_browsertest.cc |
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/browser/gpu_blacklist.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/common/chrome_paths.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/test_launcher_utils.h" |
#include "chrome/test/base/tracing.h" |
@@ -55,6 +56,7 @@ class GpuFeatureTest : public InProcessBrowserTest { |
#endif |
} |
command_line->AppendSwitch(switches::kDisablePopupBlocking); |
+ command_line->AppendSwitchASCII(switches::kWindowSize, "400,300"); |
} |
void SetupBlacklist(const std::string& json_blacklist) { |
@@ -323,5 +325,18 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) { |
RunTest(url, "\"SUCCESS\"", false); |
} |
+class ThreadedCompositorTest : public GpuFeatureTest { |
+ public: |
+ virtual void SetUpCommandLine(CommandLine* command_line) { |
+ GpuFeatureTest::SetUpCommandLine(command_line); |
+ command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
+ } |
+}; |
+ |
+IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) { |
+ const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
+ RunTest(url, EXPECT_GPU_SWAP_BUFFERS); |
+} |
+ |
} // namespace anonymous |