diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 00:42:04 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 00:42:04 +0000 |
| commit | 609774a738bc51f5ba28ee21e551fe7328ad931b (patch) | |
| tree | da0d0f7ef0737962d861e23a2126a42894b445ac | |
| parent | 160f17f10e3675c8fa1215f039bd16a3ff3da77f (diff) | |
| download | chromium_src-609774a738bc51f5ba28ee21e551fe7328ad931b.zip chromium_src-609774a738bc51f5ba28ee21e551fe7328ad931b.tar.gz chromium_src-609774a738bc51f5ba28ee21e551fe7328ad931b.tar.bz2 | |
Removed GPUUITest suite. It contained only one test UITestCanLaunchWithOSMesa, which is invalid with use-gl=any flag.
This was committed as part of r105914, which was later reverted due to mysterious tsan failures. I am splitting the original patch into smaller chunks to figure out the failure.
Review URL: http://codereview.chromium.org/8348013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106188 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gpu_uitest.cc | 38 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/chrome/browser/gpu_uitest.cc b/chrome/browser/gpu_uitest.cc index ce46e78..e69de29 100644 --- a/chrome/browser/gpu_uitest.cc +++ b/chrome/browser/gpu_uitest.cc @@ -1,38 +0,0 @@ -// Copyright (c) 2011 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 <string> - -#include "build/build_config.h" -#include "chrome/common/chrome_switches.h" -#include "chrome/test/base/test_launcher_utils.h" -#include "chrome/test/ui/ui_test.h" -#include "net/base/net_util.h" -#include "ui/gfx/gl/gl_implementation.h" - -class GPUUITest : public UITest { - protected: - GPUUITest() { - } - - virtual void SetUp() { - UITest::SetUp(); - - gpu_test_dir_ = test_data_directory_.AppendASCII("gpu"); - } - - FilePath gpu_test_dir_; -}; - -#if !defined(OS_WIN) && defined(TOOLKIT_VIEWS) -#define UITestCanLaunchWithOSMesa DISABLED_UITestCanLaunchWithOSMesa -// http://crbug.com/76217 -#endif -TEST_F(GPUUITest, UITestCanLaunchWithOSMesa) { - // Check the webgl test reports success and that the renderer was OSMesa. - NavigateToURL( - net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl.html"))); - - EXPECT_EQ(std::wstring(L"SUCCESS: WebKit WebGL"), GetActiveTabTitle()); -} diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 8a16723c..94900ab 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -694,7 +694,6 @@ 'browser/download/save_page_uitest.cc', 'browser/default_plugin_uitest.cc', 'browser/fast_shutdown_uitest.cc', - 'browser/gpu_uitest.cc', 'browser/history/multipart_uitest.cc', 'browser/history/redirect_uitest.cc', 'browser/iframe_uitest.cc', |