Index: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc |
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc |
index 8aa86f31f3360ef9c9c24550503fd68789152c1c..b3eb49c19a90da75e5931d5c8a388121c3b78068 100644 |
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc |
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc |
@@ -35,7 +35,7 @@ class MobileSetupDialogDelegate : public WebDialogDelegate { |
void ShowDialog(const std::string& service_path); |
protected: |
- friend struct DefaultSingletonTraits<MobileSetupDialogDelegate>; |
+ friend struct base::DefaultSingletonTraits<MobileSetupDialogDelegate>; |
MobileSetupDialogDelegate(); |
~MobileSetupDialogDelegate() override; |
@@ -71,7 +71,7 @@ void MobileSetupDialog::Show(const std::string& 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) { |