Move Singleton and related structs to namespace base

components/app_modal/javascript_dialog_manager.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 "components/app_modal/javascript_dialog_manager.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/app_modal/app_modal_dialog.h"
@@ skipping 34 matching lines @@
   return extra_data->has_already_shown_a_dialog_;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // JavaScriptDialogManager, public:
 
 // static
 JavaScriptDialogManager* JavaScriptDialogManager::GetInstance() {
-  return Singleton<JavaScriptDialogManager>::get();
+  return base::Singleton<JavaScriptDialogManager>::get();
 }
 
 void JavaScriptDialogManager::SetNativeDialogFactory(
     scoped_ptr<JavaScriptNativeDialogFactory> factory) {
   native_dialog_factory_ = factory.Pass();
 }
 
 void JavaScriptDialogManager::SetExtensionsClient(
     scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client) {
   extensions_client_ = extensions_client.Pass();
@@ skipping 166 matching lines @@
     const base::string16& user_input) {
   // If an extension opened this dialog then the extension may shut down its
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal