diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 23:54:31 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 23:54:31 +0000 |
commit | 2727c73679b340aaf11c41ed4e57ada626f9c5a5 (patch) | |
tree | 8ce56f37c1a07fad0b97a6d6abaf372f0239eb86 /chrome/test | |
parent | b49b27f504501ecafee601985176dcbad9540f56 (diff) | |
download | chromium_src-2727c73679b340aaf11c41ed4e57ada626f9c5a5.zip chromium_src-2727c73679b340aaf11c41ed4e57ada626f9c5a5.tar.gz chromium_src-2727c73679b340aaf11c41ed4e57ada626f9c5a5.tar.bz2 |
Removed GPU plugin.
Pepper 3D v2 does not use the GPU plugin. It is integrated with the accelerated compositor.
TEST=PPAPI 3D v2 still works, trybots
BUG=none
Review URL: http://codereview.chromium.org/6588090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/ui/pepper_uitest.cc | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc deleted file mode 100644 index f34346d..0000000 --- a/chrome/test/ui/pepper_uitest.cc +++ /dev/null @@ -1,47 +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 "base/file_path.h" - -#include "app/app_switches.h" -#include "base/test/test_timeouts.h" -#include "chrome/common/chrome_switches.h" -#include "chrome/test/ui/npapi_test_helper.h" -#include "chrome/test/ui_test_utils.h" - -using npapi_test::kTestCompleteCookie; -using npapi_test::kTestCompleteSuccess; - -// Helper class pepper NPAPI tests. -class PepperTester : public NPAPITesterBase { - protected: - PepperTester() : NPAPITesterBase() {} - - virtual void SetUp() { - // TODO(alokp): Remove no-sandbox flag once gpu plugin can run in sandbox. - launch_arguments_.AppendSwitch(switches::kNoSandbox); - launch_arguments_.AppendSwitch(switches::kInternalPepper); - launch_arguments_.AppendSwitch(switches::kEnableGPUPlugin); - // Use Mesa software renderer so it can run on testbots without any - // graphics hardware. - launch_arguments_.AppendSwitchASCII(switches::kUseGL, "osmesa"); - NPAPITesterBase::SetUp(); - } -}; - -// Test that a pepper 3d plugin loads and renders. -// TODO(alokp): Enable the test after making sure it works on all platforms -// and buildbots have OpenGL support. -#if defined(OS_WIN) -// Marked as FAILS (46662): failing on buildbots but passes on trybots. -TEST_F(PepperTester, FAILS_Pepper3D) { - const FilePath dir(FILE_PATH_LITERAL("pepper")); - const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); - GURL url = ui_test_utils::GetTestUrl(dir, file); - ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); - WaitForFinish("pepper_3d", "1", url, - kTestCompleteCookie, kTestCompleteSuccess, - TestTimeouts::action_max_timeout_ms()); -} -#endif |