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

Unified Diff: content/common/sandbox_mac_system_access_unittest.mm

Issue 11228040: Move sandbox code in content to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/common/sandbox_mac_system_access_unittest.mm
===================================================================
--- content/common/sandbox_mac_system_access_unittest.mm (revision 163460)
+++ content/common/sandbox_mac_system_access_unittest.mm (working copy)
@@ -11,13 +11,11 @@
#include "content/common/sandbox_mac_unittest_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace {
+namespace content {
-using sandboxtest::MacSandboxTest;
-
//--------------------- Clipboard Sandboxing ----------------------
// Test case for checking sandboxing of clipboard access.
-class MacSandboxedClipboardTestCase : public sandboxtest::MacSandboxTestCase {
+class MacSandboxedClipboardTestCase : public MacSandboxTestCase {
public:
MacSandboxedClipboardTestCase();
virtual ~MacSandboxedClipboardTestCase();
@@ -79,7 +77,7 @@
//--------------------- File Access Sandboxing ----------------------
// Test case for checking sandboxing of filesystem apis.
-class MacSandboxedFileAccessTestCase : public sandboxtest::MacSandboxTestCase {
+class MacSandboxedFileAccessTestCase : public MacSandboxTestCase {
public:
virtual bool SandboxedTest();
};
@@ -98,7 +96,7 @@
//--------------------- /dev/urandom Sandboxing ----------------------
// /dev/urandom is available to ppapi sandbox only.
-class MacSandboxedUrandomTestCase : public sandboxtest::MacSandboxTestCase {
+class MacSandboxedUrandomTestCase : public MacSandboxTestCase {
public:
virtual bool SandboxedTest();
};
@@ -126,9 +124,9 @@
// Similar to RunTestInAllSandboxTypes(), except changing
// |test_data| for the ppapi case. Passing "" in the non-ppapi case
// to overwrite the test data (NULL means not to change it).
- for (content::SandboxType i = content::SANDBOX_TYPE_FIRST_TYPE;
- i < content::SANDBOX_TYPE_AFTER_LAST_TYPE; ++i) {
- if (i == content::SANDBOX_TYPE_PPAPI) {
+ for (SandboxType i = SANDBOX_TYPE_FIRST_TYPE;
+ i < SANDBOX_TYPE_AFTER_LAST_TYPE; ++i) {
+ if (i == SANDBOX_TYPE_PPAPI) {
EXPECT_TRUE(RunTestInSandbox(i, "MacSandboxedUrandomTestCase", "ppapi"));
} else {
EXPECT_TRUE(RunTestInSandbox(i, "MacSandboxedUrandomTestCase", ""))
@@ -137,4 +135,4 @@
}
}
-} // namespace
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698