Move Singleton and related structs to namespace base

components/nacl/browser/pnacl_host.h

 // Copyright 2013 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 COMPONENTS_NACL_BROWSER_PNACL_HOST_H_
 #define COMPONENTS_NACL_BROWSER_PNACL_HOST_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
@@ skipping 83 matching lines @@
                                            base::Time end_time,
                                            const base::Closure& callback);
 
   // Return the number of tracked translations or FD requests currently pending.
   size_t pending_translations() { return pending_translations_.size(); }
 
  private:
   // PnaclHost is a singleton because there is only one translation cache, and
   // so that the BrowsingDataRemover can clear it even if no translation has
   // ever been started.
-  friend struct DefaultSingletonTraits<PnaclHost>;
+  friend struct base::DefaultSingletonTraits<PnaclHost>;
   friend class FileProxy;
   friend class pnacl::PnaclHostTest;
   friend class pnacl::PnaclHostTestDisk;
   enum CacheState {
     CacheUninitialized,
     CacheInitializing,
     CacheReady
   };
   class PendingTranslation {
    public:
@@ skipping 58 matching lines @@
   scoped_ptr<pnacl::PnaclTranslationCache> disk_cache_;
   PendingTranslationMap pending_translations_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<PnaclHost> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(PnaclHost);
 };
 
 }  // namespace pnacl
 
 #endif  // COMPONENTS_NACL_BROWSER_PNACL_HOST_H_