Move Singleton and related structs to namespace base

content/browser/media/android/media_drm_credential_manager.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/media/android/media_drm_credential_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 21 matching lines @@
 }  // namespace
 
 namespace content {
 
 MediaDrmCredentialManager::MediaDrmCredentialManager() {};
 
 MediaDrmCredentialManager::~MediaDrmCredentialManager() {};
 
 // static
 MediaDrmCredentialManager* MediaDrmCredentialManager::GetInstance() {
-  return Singleton<MediaDrmCredentialManager>::get();
+  return base::Singleton<MediaDrmCredentialManager>::get();
 }
 
 void MediaDrmCredentialManager::ResetCredentials(
     const ResetCredentialsCB& reset_credentials_cb) {
   // Ignore reset request if one is already in progress.
   if (!reset_credentials_cb_.is_null())
     return;
 
   reset_credentials_cb_ = reset_credentials_cb;
 
@@ skipping 57 matching lines @@
   media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb);
   return true;
 }
 
 // static
 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content