Move Singleton and related structs to namespace base

chrome/browser/android/omnibox/autocomplete_controller_android.cc

 // Copyright 2014 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/android/omnibox/autocomplete_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 277 matching lines @@
     Profile* profile, JNIEnv* env, jobject obj) {
   AutocompleteControllerAndroid* bridge =
       static_cast<AutocompleteControllerAndroid*>(
           GetInstance()->GetServiceForBrowserContext(profile, true));
   bridge->InitJNI(env, obj);
   return bridge;
 }
 
 AutocompleteControllerAndroid::Factory*
 AutocompleteControllerAndroid::Factory::GetInstance() {
-  return Singleton<AutocompleteControllerAndroid::Factory>::get();
+  return base::Singleton<AutocompleteControllerAndroid::Factory>::get();
 }
 
 content::BrowserContext*
 AutocompleteControllerAndroid::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 AutocompleteControllerAndroid::Factory::Factory()
     : BrowserContextKeyedServiceFactory(
@@ skipping 245 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }