Index: chrome/test/ppapi/ppapi_test.cc |
=================================================================== |
--- chrome/test/ppapi/ppapi_test.cc (revision 257432) |
+++ chrome/test/ppapi/ppapi_test.cc (working copy) |
@@ -358,10 +358,6 @@ |
RETURN_IF_NO_NACL(); |
PPAPITestBase::SetUpCommandLine(command_line); |
- base::FilePath plugin_lib; |
- EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
- EXPECT_TRUE(base::PathExists(plugin_lib)); |
- |
// Enable running (non-portable) NaCl outside of the Chrome web store. |
command_line->AppendSwitch(switches::kEnableNaCl); |
command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1"); |
@@ -369,6 +365,12 @@ |
command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); |
} |
+void PPAPINaClTest::SetUpOnMainThread() { |
+ base::FilePath plugin_lib; |
+ EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
+ EXPECT_TRUE(base::PathExists(plugin_lib)); |
+} |
+ |
void PPAPINaClTest::RunTest(const std::string& test_case) { |
RETURN_IF_NO_NACL(); |
PPAPITestBase::RunTest(test_case); |
@@ -446,10 +448,6 @@ |
CommandLine* command_line) { |
PPAPITestBase::SetUpCommandLine(command_line); |
- base::FilePath plugin_lib; |
- EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
- EXPECT_TRUE(base::PathExists(plugin_lib)); |
- |
// Enable running (non-portable) NaCl outside of the Chrome web store. |
command_line->AppendSwitch(switches::kEnableNaCl); |
} |
@@ -465,4 +463,8 @@ |
void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
// The default content setting for the PPAPI broker is ASK. We purposefully |
// don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
+ |
+ base::FilePath plugin_lib; |
+ EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
+ EXPECT_TRUE(base::PathExists(plugin_lib)); |
} |