Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5065)

Unified Diff: chrome/test/ui/pepper_uitest.cc

Issue 6588090: Removed GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/pepper_uitest.cc
===================================================================
--- chrome/test/ui/pepper_uitest.cc (revision 76392)
+++ chrome/test/ui/pepper_uitest.cc (working copy)
@@ -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
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698