Move Singleton and related structs to namespace base

content/common/sandbox_linux/sandbox_linux.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_SANDBOX_LINUX_SANDBOX_LINUX_H_
 #define CONTENT_COMMON_SANDBOX_LINUX_SANDBOX_LINUX_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/common/sandbox_linux.h"
 
 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
     defined(THREAD_SANITIZER) || defined(LEAK_SANITIZER) || \
     defined(UNDEFINED_SANITIZER) || defined(SANITIZER_COVERAGE)
 #include <sanitizer/common_interface_defs.h>
 #define ANY_OF_AMTLU_SANITIZER 1
 #endif
 
-template <typename T> struct DefaultSingletonTraits;
 namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
 class Thread;
 }
 namespace sandbox { class SetuidSandboxClient; }
 
 namespace content {
 
 // A singleton class to represent and change our sandboxing state for the
 // three main Linux sandboxes.
 // The sandboxing model allows using two layers of sandboxing. The first layer
 // can be implemented either with unprivileged namespaces or with the setuid
@@ skipping 91 matching lines @@
     return proc_fd_;
   }
 
 #if defined(ANY_OF_AMTLU_SANITIZER)
   __sanitizer_sandbox_arguments* sanitizer_args() const {
     return sanitizer_args_.get();
   };
 #endif
 
  private:
-  friend struct DefaultSingletonTraits<LinuxSandbox>;
+  friend struct base::DefaultSingletonTraits<LinuxSandbox>;
 
   LinuxSandbox();
   ~LinuxSandbox();
 
   // Some methods are static and get an instance of the Singleton. These
   // are the non-static implementations.
   bool InitializeSandboxImpl();
   void StopThreadImpl(base::Thread* thread);
   // We must have been pre_initialized_ before using these.
   bool seccomp_bpf_supported() const;
@@ skipping 29 matching lines @@
 #if defined(ANY_OF_AMTLU_SANITIZER)
   scoped_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(LinuxSandbox);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SANDBOX_LINUX_SANDBOX_LINUX_H_