| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Wed Dec 18 16:25:09 2013 +0000 |
| committer | Torne (Richard Coles) <torne@google.com> | Wed Dec 18 16:25:09 2013 +0000 |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f [diff] [blame] |
Merge from Chromium at DEPS revision 240154 This commit was generated by merge_to_master.py. Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
diff --git a/sandbox/linux/seccomp-bpf/syscall_iterator_unittest.cc b/sandbox/linux/seccomp-bpf/syscall_iterator_unittest.cc index 61e95d7..08a857a 100644 --- a/sandbox/linux/seccomp-bpf/syscall_iterator_unittest.cc +++ b/sandbox/linux/seccomp-bpf/syscall_iterator_unittest.cc
@@ -6,7 +6,7 @@ #include "sandbox/linux/seccomp-bpf/syscall_iterator.h" #include "sandbox/linux/tests/unit_tests.h" -using namespace playground2; +namespace sandbox { namespace { @@ -132,3 +132,5 @@ } } // namespace + +} // namespace sandbox