Move Singleton and related structs to namespace base

chrome/browser/plugins/plugin_finder.cc

 // 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.
 
 #include "chrome/browser/plugins/plugin_finder.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 143 matching lines @@
 }  // namespace
 
 // static
 void PluginFinder::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kDisablePluginFinder, false);
 }
 
 // static
 PluginFinder* PluginFinder::GetInstance() {
   // PluginFinder::GetInstance() is the only method that's allowed to call
-  // Singleton<PluginFinder>::get().
-  return Singleton<PluginFinder>::get();
+  // base::Singleton<PluginFinder>::get().
+  return base::Singleton<PluginFinder>::get();
 }
 
 PluginFinder::PluginFinder() : version_(-1) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void PluginFinder::Init() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // Load the built-in plugin list first. If we have a newer version stored
   // locally or download one, we will replace this one with it.
@@ skipping 200 matching lines @@
     metadata->AddMatchingMimeType(plugin.mime_types[i].mime_type);
 
   DCHECK(metadata->MatchesPlugin(plugin));
   if (identifier_plugin_.find(identifier) != identifier_plugin_.end())
     identifier = GetLongIdentifier(plugin);
 
   DCHECK(identifier_plugin_.find(identifier) == identifier_plugin_.end());
   identifier_plugin_[identifier] = metadata;
   return metadata->Clone();
 }