Move Singleton and related structs to namespace base

components/nacl/browser/nacl_browser.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_NACL_BROWSER_H_
 #define COMPONENTS_NACL_BROWSER_NACL_BROWSER_H_
 
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 120 matching lines @@
   // Each time a NaCl process ends, the browser is notified.
   void OnProcessEnd(int process_id);
   // Support for NaCl crash throttling.
   // Each time a NaCl module crashes, the browser is notified.
   void OnProcessCrashed();
   // If "too many" crashes occur within a given time period, NaCl is throttled
   // until the rate again drops below the threshold.
   bool IsThrottled();
 
  private:
-  friend struct DefaultSingletonTraits<NaClBrowser>;
+  friend struct base::DefaultSingletonTraits<NaClBrowser>;
 
   enum NaClResourceState {
     NaClResourceUninitialized,
     NaClResourceRequested,
     NaClResourceReady
   };
 
   NaClBrowser();
   ~NaClBrowser();
 
@@ skipping 48 matching lines @@
 
   // Singletons get destroyed at shutdown.
   base::WeakPtrFactory<NaClBrowser> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClBrowser);
 };
 
 } // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_BROWSER_H_