Move Singleton and related structs to namespace base

chrome/browser/android/omnibox/autocomplete_controller_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_OMNIBOX_AUTOCOMPLETE_CONTROLLER_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_OMNIBOX_AUTOCOMPLETE_CONTROLLER_ANDROID_H_
 
 #include <string>
 
 #include "base/android/jni_weak_ref.h"
@@ skipping 68 matching lines @@
                                              JNIEnv* env,
                                              jobject obj);
 
     static Factory* GetInstance();
 
    protected:
     content::BrowserContext* GetBrowserContextToUse(
         content::BrowserContext* context) const override;
 
    private:
-    friend struct DefaultSingletonTraits<Factory>;
+    friend struct base::DefaultSingletonTraits<Factory>;
 
     Factory();
     ~Factory() override;
 
     // BrowserContextKeyedServiceFactory
     KeyedService* BuildServiceInstanceFor(
         content::BrowserContext* profile) const override;
   };
 
  private:
@@ skipping 43 matching lines @@
   JavaObjectWeakGlobalRef weak_java_autocomplete_controller_android_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteControllerAndroid);
 };
 
 // Registers the LocationBar native method.
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env);
 
 #endif  // CHROME_BROWSER_ANDROID_OMNIBOX_AUTOCOMPLETE_CONTROLLER_ANDROID_H_