Move Singleton and related structs to namespace base

content/browser/geolocation/location_api_adapter_android.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/geolocation/location_api_adapter_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 116 matching lines @@
                                                     jstring message) {
   Geoposition position_error;
   position_error.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
   position_error.error_message =
       base::android::ConvertJavaStringToUTF8(env, message);
   GetInstance()->OnNewGeopositionInternal(position_error);
 }
 
 // static
 AndroidLocationApiAdapter* AndroidLocationApiAdapter::GetInstance() {
-  return Singleton<AndroidLocationApiAdapter>::get();
+  return base::Singleton<AndroidLocationApiAdapter>::get();
 }
 
 // static
 bool AndroidLocationApiAdapter::RegisterGeolocationService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void AndroidLocationApiAdapter::CreateJavaObject(JNIEnv* env) {
   // Create the Java AndroidLocationProvider object.
   java_location_provider_android_object_.Reset(
       Java_LocationProviderAdapter_create(env,
           base::android::GetApplicationContext()));
   CHECK(!java_location_provider_android_object_.is_null());
 }
 
 void AndroidLocationApiAdapter::OnNewGeopositionInternal(
     const Geoposition& geoposition) {
   base::AutoLock lock(lock_);
   if (!task_runner_.get())
     return;
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AndroidLocationApiAdapter::NotifyProviderNewGeoposition,
                  geoposition));
 }
 
 }  // namespace content