Move Singleton and related structs to namespace base

chrome/browser/extensions/extension_renderer_state.cc

 // Copyright (c) 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 "chrome/browser/extensions/extension_renderer_state.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ skipping 158 matching lines @@
 //
 
 ExtensionRendererState::ExtensionRendererState() : observer_(NULL) {
 }
 
 ExtensionRendererState::~ExtensionRendererState() {
 }
 
 // static
 ExtensionRendererState* ExtensionRendererState::GetInstance() {
-  return Singleton<ExtensionRendererState>::get();
+  return base::Singleton<ExtensionRendererState>::get();
 }
 
 void ExtensionRendererState::Init() {
   observer_ = new TabObserver;
 }
 
 void ExtensionRendererState::Shutdown() {
   delete observer_;
 }
 
@@ skipping 23 matching lines @@
   int render_view_id = info->GetRouteID();
   RenderId render_id(render_process_id, render_view_id);
   TabAndWindowIdMap::iterator iter = map_.find(render_id);
   if (iter != map_.end()) {
     *tab_id = iter->second.first;
     *window_id = iter->second.second;
     return true;
   }
   return false;
 }