Move Singleton and related structs to namespace base

components/service_tab_launcher/browser/android/service_tab_launcher.h

 // Copyright 2015 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 COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_
 #define COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_
 
 #include "base/android/jni_android.h"
 #include "base/callback_forward.h"
 #include "base/id_map.h"
@@ skipping 26 matching lines @@
                  const TabLaunchedCallback& callback);
 
   // To be called when the tab for |request_id| has launched, with the
   // associated |web_contents|. The WebContents must not yet have started
   // the provisional load for the main frame of the navigation.
   void OnTabLaunched(int request_id, content::WebContents* web_contents);
 
   static bool RegisterServiceTabLauncher(JNIEnv* env);
 
  private:
-  friend struct DefaultSingletonTraits<ServiceTabLauncher>;
+  friend struct base::DefaultSingletonTraits<ServiceTabLauncher>;
 
   ServiceTabLauncher();
   ~ServiceTabLauncher();
 
   IDMap<TabLaunchedCallback> tab_launched_callbacks_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTabLauncher);
 };
 
 }  // namespace service_tab_launcher
 
 #endif  // COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_