Move Singleton and related structs to namespace base

content/browser/android/download_controller_android_impl.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 "content/browser/android/download_controller_android_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 127 matching lines @@
 
 //static
 void DownloadControllerAndroid::SetDownloadControllerAndroid(
     DownloadControllerAndroid* download_controller) {
   base::AutoLock lock(g_download_controller_lock_.Get());
   DownloadControllerAndroid::download_controller_ = download_controller;
 }
 
 // static
 DownloadControllerAndroidImpl* DownloadControllerAndroidImpl::GetInstance() {
-  return Singleton<DownloadControllerAndroidImpl>::get();
+  return base::Singleton<DownloadControllerAndroidImpl>::get();
 }
 
 DownloadControllerAndroidImpl::DownloadControllerAndroidImpl()
     : java_object_(NULL) {
 }
 
 DownloadControllerAndroidImpl::~DownloadControllerAndroidImpl() {
   if (java_object_) {
     JNIEnv* env = base::android::AttachCurrentThread();
     env->DeleteWeakGlobalRef(java_object_->obj);
@@ skipping 416 matching lines @@
   }
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (info)
     has_user_gesture = info->HasUserGesture();
 }
 
 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content