Move Singleton and related structs to namespace base

chrome/browser/chromeos/login/ui/user_adding_screen.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/chromeos/login/ui/user_adding_screen.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 16 matching lines @@
  public:
   void Start() override;
   void Cancel() override;
   bool IsRunning() override;
 
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
 
   static UserAddingScreenImpl* GetInstance();
  private:
-  friend struct DefaultSingletonTraits<UserAddingScreenImpl>;
+  friend struct base::DefaultSingletonTraits<UserAddingScreenImpl>;
 
   void OnDisplayHostCompletion();
 
   UserAddingScreenImpl();
   ~UserAddingScreenImpl() override;
 
   base::ObserverList<Observer> observers_;
   LoginDisplayHost* display_host_;
 
   UserAddingScreenInputMethodsController im_controller_;
@@ skipping 42 matching lines @@
   CHECK(IsRunning());
   display_host_ = NULL;
 
   g_browser_process->platform_part()->SessionManager()->SetSessionState(
       session_manager::SESSION_STATE_ACTIVE);
   FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingFinished());
 }
 
 // static
 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() {
-  return Singleton<UserAddingScreenImpl>::get();
+  return base::Singleton<UserAddingScreenImpl>::get();
 }
 
 UserAddingScreenImpl::UserAddingScreenImpl()
     : display_host_(NULL), im_controller_(this) {
 }
 
 UserAddingScreenImpl::~UserAddingScreenImpl() {
 }
 
 }  // anonymous namespace
 
 UserAddingScreen::UserAddingScreen() {}
 UserAddingScreen::~UserAddingScreen() {}
 
 UserAddingScreen* UserAddingScreen::Get() {
   return UserAddingScreenImpl::GetInstance();
 }
 
 }  // namespace chromeos