Move Singleton and related structs to namespace base

components/nacl/browser/nacl_broker_service_win.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 COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_
 #define COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 33 matching lines @@
   // Called by NaClBrokerHost to notify the service that a debug
   // exception handler was started.
   void OnDebugExceptionHandlerLaunched(int32 pid, bool success);
 
  private:
   typedef std::map<std::string, base::WeakPtr<NaClProcessHost> >
       PendingLaunchesMap;
   typedef std::map<int, base::WeakPtr<NaClProcessHost> >
       PendingDebugExceptionHandlersMap;
 
-  friend struct DefaultSingletonTraits<NaClBrokerService>;
+  friend struct base::DefaultSingletonTraits<NaClBrokerService>;
 
   NaClBrokerService();
   ~NaClBrokerService();
 
   NaClBrokerHost* GetBrokerHost();
 
   int loaders_running_;
   PendingLaunchesMap pending_launches_;
   PendingDebugExceptionHandlersMap pending_debuggers_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerService);
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_