summaryrefslogtreecommitdiffstats
path: root/chrome/test/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ppapi')
-rw-r--r--chrome/test/ppapi/ppapi_test.cc29
-rw-r--r--chrome/test/ppapi/ppapi_test.h20
2 files changed, 27 insertions, 22 deletions
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 30fc4c8..0074c9f 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -50,7 +50,7 @@ const char library_name[] = "ppapi_tests.plugin";
const char library_name[] = "libppapi_tests.so";
#endif
-void AddPrivateSwitches(CommandLine* command_line) {
+void AddPrivateSwitches(base::CommandLine* command_line) {
// For TestRequestOSFileHandle.
command_line->AppendSwitch(switches::kUnlimitedStorage);
command_line->AppendSwitchASCII(switches::kAllowNaClFileHandleAPI,
@@ -142,7 +142,7 @@ void PPAPITestBase::SetUp() {
InProcessBrowserTest::SetUp();
}
-void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) {
+void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) {
// The test sends us the result via a cookie.
command_line->AppendSwitch(switches::kEnableFileCookies);
@@ -272,7 +272,8 @@ std::string PPAPITestBase::StripPrefixes(const std::string& test_name) {
void PPAPITestBase::RunTestURL(const GURL& test_url) {
#if defined(OS_WIN) && defined(USE_ASH)
// PPAPITests are broken in Ash browser tests (http://crbug.com/263548).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests)) {
LOG(WARNING) << "PPAPITests are disabled for Ash browser tests.";
return;
}
@@ -308,7 +309,7 @@ GURL PPAPITestBase::GetTestURL(
PPAPITest::PPAPITest() : in_process_(true) {
}
-void PPAPITest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPITest::SetUpCommandLine(base::CommandLine* command_line) {
PPAPITestBase::SetUpCommandLine(command_line);
// Append the switch to register the pepper plugin.
@@ -334,7 +335,7 @@ std::string PPAPITest::BuildQuery(const std::string& base,
return base::StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str());
}
-void PPAPIPrivateTest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPIPrivateTest::SetUpCommandLine(base::CommandLine* command_line) {
PPAPITest::SetUpCommandLine(command_line);
AddPrivateSwitches(command_line);
}
@@ -343,18 +344,19 @@ OutOfProcessPPAPITest::OutOfProcessPPAPITest() {
in_process_ = false;
}
-void OutOfProcessPPAPITest::SetUpCommandLine(CommandLine* command_line) {
+void OutOfProcessPPAPITest::SetUpCommandLine(base::CommandLine* command_line) {
PPAPITest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
}
-void OutOfProcessPPAPIPrivateTest::SetUpCommandLine(CommandLine* command_line) {
+void OutOfProcessPPAPIPrivateTest::SetUpCommandLine(
+ base::CommandLine* command_line) {
OutOfProcessPPAPITest::SetUpCommandLine(command_line);
AddPrivateSwitches(command_line);
}
-void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPINaClTest::SetUpCommandLine(base::CommandLine* command_line) {
RETURN_IF_NO_NACL();
PPAPITestBase::SetUpCommandLine(command_line);
@@ -413,7 +415,8 @@ std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base,
test_case.c_str());
}
-void PPAPIPrivateNaClNewlibTest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPIPrivateNaClNewlibTest::SetUpCommandLine(
+ base::CommandLine* command_line) {
PPAPINaClNewlibTest::SetUpCommandLine(command_line);
AddPrivateSwitches(command_line);
}
@@ -425,7 +428,8 @@ std::string PPAPINaClGLibcTest::BuildQuery(const std::string& base,
test_case.c_str());
}
-void PPAPIPrivateNaClGLibcTest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPIPrivateNaClGLibcTest::SetUpCommandLine(
+ base::CommandLine* command_line) {
PPAPINaClGLibcTest::SetUpCommandLine(command_line);
AddPrivateSwitches(command_line);
}
@@ -437,13 +441,14 @@ std::string PPAPINaClPNaClTest::BuildQuery(const std::string& base,
test_case.c_str());
}
-void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(CommandLine* command_line) {
+void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(
+ base::CommandLine* command_line) {
PPAPINaClPNaClTest::SetUpCommandLine(command_line);
AddPrivateSwitches(command_line);
}
void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
PPAPITestBase::SetUpCommandLine(command_line);
base::FilePath plugin_lib;
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index e55daf1..ef76639 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -41,7 +41,7 @@ class PPAPITestBase : public InProcessBrowserTest {
// InProcessBrowserTest:
virtual void SetUp() OVERRIDE;
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
virtual void SetUpOnMainThread() OVERRIDE;
virtual std::string BuildQuery(const std::string& base,
@@ -99,7 +99,7 @@ class PPAPITest : public PPAPITestBase {
public:
PPAPITest();
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
virtual std::string BuildQuery(const std::string& base,
const std::string& test_case) OVERRIDE;
@@ -109,7 +109,7 @@ class PPAPITest : public PPAPITestBase {
class PPAPIPrivateTest : public PPAPITest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
// Variant of PPAPITest that runs plugins out-of-process to test proxy
@@ -118,18 +118,18 @@ class OutOfProcessPPAPITest : public PPAPITest {
public:
OutOfProcessPPAPITest();
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
// NaCl plugin test runner for Newlib runtime.
class PPAPINaClTest : public PPAPITestBase {
public:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
// PPAPITestBase overrides.
virtual void RunTest(const std::string& test_case) OVERRIDE;
virtual void RunTestAndReload(const std::string& test_case) OVERRIDE;
@@ -152,7 +152,7 @@ class PPAPINaClNewlibTest : public PPAPINaClTest {
class PPAPIPrivateNaClNewlibTest : public PPAPINaClNewlibTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
// NaCl plugin test runner for GNU-libc runtime.
@@ -164,7 +164,7 @@ class PPAPINaClGLibcTest : public PPAPINaClTest {
class PPAPIPrivateNaClGLibcTest : public PPAPINaClGLibcTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
// NaCl plugin test runner for the PNaCl + Newlib runtime.
@@ -176,12 +176,12 @@ class PPAPINaClPNaClTest : public PPAPINaClTest {
class PPAPIPrivateNaClPNaClTest : public PPAPINaClPNaClTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
};
class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
public:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
virtual std::string BuildQuery(const std::string& base,
const std::string& test_case) OVERRIDE;
generated by cgit v1.1 at 2024-07-22 23:08:16 +0000