Move Singleton and related structs to namespace base

components/app_modal/javascript_dialog_manager.h

 // 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.
 
 #ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
 #define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
@@ skipping 17 matching lines @@
   void SetNativeDialogFactory(
       scoped_ptr<JavaScriptNativeDialogFactory> factory);
 
   // JavaScript dialogs may be opened by an extensions/app, thus they need
   // access to extensions functionality. This sets a client interface to
   // access //extensions.
   void SetExtensionsClient(
       scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client);
 
  private:
-  friend struct DefaultSingletonTraits<JavaScriptDialogManager>;
+  friend struct base::DefaultSingletonTraits<JavaScriptDialogManager>;
 
   JavaScriptDialogManager();
   ~JavaScriptDialogManager() override;
 
   // JavaScriptDialogManager:
   void RunJavaScriptDialog(content::WebContents* web_contents,
                            const GURL& origin_url,
                            const std::string& accept_lang,
                            content::JavaScriptMessageType message_type,
                            const base::string16& message_text,
@@ skipping 29 matching lines @@
 
   scoped_ptr<JavaScriptNativeDialogFactory> native_dialog_factory_;
   scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManager);
 };
 
 }  // namespace app_modal
 
 #endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_