Move Singleton and related structs to namespace base

content/browser/message_port_service.cc

 // 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.
 
 #include "content/browser/message_port_service.h"
 
 #include "content/common/message_port_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/message_port_delegate.h"
 
@@ skipping 32 matching lines @@
     return queue_for_inflight_messages || hold_messages_for_destination;
   }
   // If true, the message port should be destroyed but was currently still
   // waiting for a SendQueuedMessages message from a renderer. As soon as that
   // message is received the port will actually be destroyed.
   bool should_be_destroyed;
   QueuedMessages queued_messages;
 };
 
 MessagePortService* MessagePortService::GetInstance() {
-  return Singleton<MessagePortService>::get();
+  return base::Singleton<MessagePortService>::get();
 }
 
 MessagePortService::MessagePortService()
     : next_message_port_id_(0) {
 }
 
 MessagePortService::~MessagePortService() {
 }
 
 void MessagePortService::UpdateMessagePort(int message_port_id,
@@ skipping 269 matching lines @@
     // Do the disentanglement (and be paranoid about the other side existing
     // just in case something unusual happened during entanglement).
     if (message_ports_.count(entangled_id)) {
       message_ports_[entangled_id].entangled_message_port_id = MSG_ROUTING_NONE;
     }
   }
   message_ports_.erase(erase_item);
 }
 
 }  // namespace content