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

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

Issue 10778044: Always enable dom automation for browser_tests. This avoids developers having to call EnableDOMAuto… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 finished_ = false; 105 finished_ = false;
106 waiting_ = false; 106 waiting_ = false;
107 result_.clear(); 107 result_.clear();
108 } 108 }
109 109
110 void PPAPITestBase::TestFinishObserver::OnTimeout() { 110 void PPAPITestBase::TestFinishObserver::OnTimeout() {
111 MessageLoopForUI::current()->Quit(); 111 MessageLoopForUI::current()->Quit();
112 } 112 }
113 113
114 PPAPITestBase::PPAPITestBase() { 114 PPAPITestBase::PPAPITestBase() {
115 EnableDOMAutomation();
116 } 115 }
117 116
118 void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) { 117 void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) {
119 // Do not use mesa if real GPU is required. 118 // Do not use mesa if real GPU is required.
120 if (!command_line->HasSwitch(switches::kUseGpuInTests)) { 119 if (!command_line->HasSwitch(switches::kUseGpuInTests)) {
121 #if !defined(OS_MACOSX) 120 #if !defined(OS_MACOSX)
122 CHECK(test_launcher_utils::OverrideGLImplementation( 121 CHECK(test_launcher_utils::OverrideGLImplementation(
123 command_line, gfx::kGLImplementationOSMesaName)) << 122 command_line, gfx::kGLImplementationOSMesaName)) <<
124 "kUseGL must not be set by test framework code!"; 123 "kUseGL must not be set by test framework code!";
125 #endif 124 #endif
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 370 }
372 371
373 // Append the correct mode and testcase string 372 // Append the correct mode and testcase string
374 std::string PPAPINaClTestDisallowedSockets::BuildQuery( 373 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
375 const std::string& base, 374 const std::string& base,
376 const std::string& test_case) { 375 const std::string& test_case) {
377 return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 376 return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
378 test_case.c_str()); 377 test_case.c_str());
379 } 378 }
380 379
OLDNEW
« no previous file with comments | « chrome/test/perf/rendering/latency_tests.cc ('k') | content/browser/dom_storage/dom_storage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698