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

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

Issue 15039009: Add PPAPI tests for VideoSource and VideoDestination resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 7 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 const std::string& test_case){ 307 const std::string& test_case){
308 return base::StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str()); 308 return base::StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str());
309 } 309 }
310 310
311 OutOfProcessPPAPITest::OutOfProcessPPAPITest() { 311 OutOfProcessPPAPITest::OutOfProcessPPAPITest() {
312 in_process_ = false; 312 in_process_ = false;
313 } 313 }
314 314
315 void OutOfProcessPPAPITest::SetUpCommandLine(CommandLine* command_line) { 315 void OutOfProcessPPAPITest::SetUpCommandLine(CommandLine* command_line) {
316 PPAPITest::SetUpCommandLine(command_line); 316 PPAPITest::SetUpCommandLine(command_line);
317 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
317 } 318 }
318 319
319 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) { 320 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
320 PPAPITestBase::SetUpCommandLine(command_line); 321 PPAPITestBase::SetUpCommandLine(command_line);
321 322
322 base::FilePath plugin_lib; 323 base::FilePath plugin_lib;
323 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); 324 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
324 EXPECT_TRUE(file_util::PathExists(plugin_lib)); 325 EXPECT_TRUE(file_util::PathExists(plugin_lib));
325 326
326 // Enable running NaCl outside of the store. 327 // Enable running NaCl outside of the store.
327 command_line->AppendSwitch(switches::kEnableNaCl); 328 command_line->AppendSwitch(switches::kEnableNaCl);
328 command_line->AppendSwitch(switches::kEnablePnacl); 329 command_line->AppendSwitch(switches::kEnablePnacl);
329 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1"); 330 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
331 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
330 } 332 }
331 333
332 // Append the correct mode and testcase string 334 // Append the correct mode and testcase string
333 std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base, 335 std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base,
334 const std::string& test_case) { 336 const std::string& test_case) {
335 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 337 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
336 test_case.c_str()); 338 test_case.c_str());
337 } 339 }
338 340
339 // Append the correct mode and testcase string 341 // Append the correct mode and testcase string
(...skipping 28 matching lines...) Expand all
368 const std::string& base, 370 const std::string& base,
369 const std::string& test_case) { 371 const std::string& test_case) {
370 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 372 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
371 test_case.c_str()); 373 test_case.c_str());
372 } 374 }
373 375
374 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 376 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
375 // The default content setting for the PPAPI broker is ASK. We purposefully 377 // The default content setting for the PPAPI broker is ASK. We purposefully
376 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 378 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
377 } 379 }
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/renderer/pepper/pepper_video_source_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698