Revert of [headless] Fix screenshots with gpu enabled.

headless/test/headless_browser_test.h

 // Copyright 2016 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.
 
 #ifndef HEADLESS_TEST_HEADLESS_BROWSER_TEST_H_
 #define HEADLESS_TEST_HEADLESS_BROWSER_TEST_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 76 matching lines @@
  private:
   std::unique_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessBrowserTest);
 };
 
 #define HEADLESS_ASYNC_DEVTOOLED_TEST_F(TEST_FIXTURE_NAME)               \
   IN_PROC_BROWSER_TEST_F(TEST_FIXTURE_NAME, RunAsyncTest) { RunTest(); } \
   class AsyncHeadlessBrowserTestNeedsSemicolon##TEST_FIXTURE_NAME {}
 
-#define HEADLESS_ASYNC_DEVTOOLED_TEST_P(TEST_FIXTURE_NAME)               \
-  IN_PROC_BROWSER_TEST_P(TEST_FIXTURE_NAME, RunAsyncTest) { RunTest(); } \
-  class AsyncHeadlessBrowserTestNeedsSemicolon##TEST_FIXTURE_NAME {}
-
 // Base class for tests that require access to a DevToolsClient. Subclasses
 // should override the RunDevTooledTest() method, which is called asynchronously
 // when the DevToolsClient is ready.
 class HeadlessAsyncDevTooledBrowserTest : public HeadlessBrowserTest,
                                           public HeadlessWebContents::Observer {
  public:
   HeadlessAsyncDevTooledBrowserTest();
   ~HeadlessAsyncDevTooledBrowserTest() override;
 
   // HeadlessWebContentsObserver implementation:
@@ skipping 11 matching lines @@
 
   HeadlessBrowserContext* browser_context_;  // Not owned.
   HeadlessWebContents* web_contents_;
   std::unique_ptr<HeadlessDevToolsClient> devtools_client_;
   bool render_process_exited_;
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_TEST_HEADLESS_BROWSER_TEST_H_