Move Singleton and related structs to namespace base

chrome/browser/ui/webui/chromeos/mobile_setup_dialog.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 "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_shutdown.h"
@@ skipping 17 matching lines @@
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 
 class MobileSetupDialogDelegate : public WebDialogDelegate {
  public:
   static MobileSetupDialogDelegate* GetInstance();
   void ShowDialog(const std::string& service_path);
 
  protected:
-  friend struct DefaultSingletonTraits<MobileSetupDialogDelegate>;
+  friend struct base::DefaultSingletonTraits<MobileSetupDialogDelegate>;
 
   MobileSetupDialogDelegate();
   ~MobileSetupDialogDelegate() override;
 
   void OnCloseDialog();
 
   // WebDialogDelegate overrides.
   ui::ModalType GetDialogModalType() const override;
   base::string16 GetDialogTitle() const override;
   GURL GetDialogContentURL() const override;
@@ skipping 15 matching lines @@
 
 // static
 void MobileSetupDialog::Show(const std::string& service_path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   MobileSetupDialogDelegate::GetInstance()->ShowDialog(service_path);
 }
 
 // static
 MobileSetupDialogDelegate* MobileSetupDialogDelegate::GetInstance() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return Singleton<MobileSetupDialogDelegate>::get();
+  return base::Singleton<MobileSetupDialogDelegate>::get();
 }
 
 MobileSetupDialogDelegate::MobileSetupDialogDelegate() : dialog_window_(NULL) {
 }
 
 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() {
 }
 
 void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) {
   service_path_ = service_path;
@@ skipping 65 matching lines @@
 }
 
 bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const {
   return true;
 }
 
 bool MobileSetupDialogDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }