Move Singleton and related structs to namespace base

content/browser/message_port_service.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 CONTENT_BROWSER_MESSAGE_PORT_SERVICE_H_
 #define CONTENT_BROWSER_MESSAGE_PORT_SERVICE_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 58 matching lines @@
 
   // Closes and cleans up the message port.
   void ClosePort(int message_port_id);
 
   void OnMessagePortDelegateClosing(MessagePortDelegate* filter);
 
   // Attempts to send the queued messages for a message port.
   void SendQueuedMessagesIfPossible(int message_port_id);
 
  private:
-  friend struct DefaultSingletonTraits<MessagePortService>;
+  friend struct base::DefaultSingletonTraits<MessagePortService>;
 
   MessagePortService();
   ~MessagePortService();
 
   void PostMessageTo(
       int message_port_id,
       const MessagePortMessage& message,
       const std::vector<TransferredMessagePort>& sent_message_ports);
 
   // Handles the details of removing a message port id. Before calling this,
   // verify that the message port id exists.
   void Erase(int message_port_id);
 
   struct MessagePort;
   typedef std::map<int, MessagePort> MessagePorts;
   MessagePorts message_ports_;
 
   // We need globally unique identifiers for each message port.
   int next_message_port_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePortService);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MESSAGE_PORT_SERVICE_H_