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

Side by Side Diff: chrome/test/ppapi/ppapi_test.cc

Issue 120313002: Use stub GL draw/clear calls for browser tests that do not need pixels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stubgl: use_osmesa Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 delegate->Accept(); 122 delegate->Accept();
123 else 123 else
124 delegate->Cancel(); 124 delegate->Cancel();
125 125
126 infobar_service->RemoveInfoBar(infobar); 126 infobar_service->RemoveInfoBar(infobar);
127 } 127 }
128 128
129 PPAPITestBase::PPAPITestBase() { 129 PPAPITestBase::PPAPITestBase() {
130 } 130 }
131 131
132 void PPAPITestBase::SetUp() {
133 // Some of these tests require pixel output.
134 UseRealGLContexts();
135
136 InProcessBrowserTest::SetUp();
137 }
138
132 void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) { 139 void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) {
133 // The test sends us the result via a cookie. 140 // The test sends us the result via a cookie.
134 command_line->AppendSwitch(switches::kEnableFileCookies); 141 command_line->AppendSwitch(switches::kEnableFileCookies);
135 142
136 // Some stuff is hung off of the testing interface which is not enabled 143 // Some stuff is hung off of the testing interface which is not enabled
137 // by default. 144 // by default.
138 command_line->AppendSwitch(switches::kEnablePepperTesting); 145 command_line->AppendSwitch(switches::kEnablePepperTesting);
139 146
140 // Smooth scrolling confuses the scrollbar test. 147 // Smooth scrolling confuses the scrollbar test.
141 command_line->AppendSwitch(switches::kDisableSmoothScrolling); 148 command_line->AppendSwitch(switches::kDisableSmoothScrolling);
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 const std::string& base, 415 const std::string& base,
409 const std::string& test_case) { 416 const std::string& test_case) {
410 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 417 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
411 test_case.c_str()); 418 test_case.c_str());
412 } 419 }
413 420
414 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 421 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
415 // The default content setting for the PPAPI broker is ASK. We purposefully 422 // The default content setting for the PPAPI broker is ASK. We purposefully
416 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 423 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
417 } 424 }
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_test.h ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698