Move Singleton and related structs to namespace base

chrome/browser/enumerate_modules_model_win.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/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 #include <algorithm>
 
@@ skipping 820 matching lines @@
     return base::string16();
   }
 
   return subject_name;
 }
 
 //  ----------------------------------------------------------------------------
 
 // static
 EnumerateModulesModel* EnumerateModulesModel::GetInstance() {
-  return Singleton<EnumerateModulesModel>::get();
+  return base::Singleton<EnumerateModulesModel>::get();
 }
 
 bool EnumerateModulesModel::ShouldShowConflictWarning() const {
   // If the user has acknowledged the conflict notification, then we don't need
   // to show it again (because the scanning only happens once per the lifetime
   // of the process). If we were to run the scanning more than once, then we'd
   // need to clear the flag somewhere when we are ready to show it again.
   if (conflict_notification_acknowledged_)
     return false;
 
@@ skipping 216 matching lines @@
   GenerateHash(base::WideToUTF8(module.location), &location);
   GenerateHash(base::WideToUTF8(module.description), &description);
   GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
 
   base::string16 url =
       l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
           base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
           base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
   return GURL(base::UTF16ToUTF8(url));
 }