Add basic threaded compositor test to gpu_feature_browsertest.cc

chrome/test/gpu/gpu_feature_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
 #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"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 using content::GpuDataManager;
@@ skipping 24 matching lines @@
 
     // Do not use mesa if real GPU is required.
     if (!command_line->HasSwitch("use-gpu-in-tests")) {
 #if !defined(OS_MACOSX)
       CHECK(test_launcher_utils::OverrideGLImplementation(
           command_line, gfx::kGLImplementationOSMesaName)) <<
           "kUseGL must not be set by test framework code!";
 #endif
     }
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
+    command_line->AppendSwitchASCII(switches::kWindowSize, "400,300");
   }
 
   void SetupBlacklist(const std::string& json_blacklist) {
     GpuBlacklist* blacklist = GpuBlacklist::GetInstance();
     ASSERT_TRUE(blacklist->LoadGpuBlacklist(
         "1.0", json_blacklist, GpuBlacklist::kAllOs));
     blacklist->UpdateGpuDataManager();
   }
 
   // If expected_reply is NULL, we don't check the reply content.
@@ skipping 248 matching lines @@
                        CanOpenPopupAndRenderWithWebGLCanvas) {
   const FilePath url(FILE_PATH_LITERAL("webgl_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) {
   const FilePath url(FILE_PATH_LITERAL("canvas_popup.html"));
   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