Move Singleton and related structs to namespace base

chrome/browser/ui/views/select_file_dialog_extension.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/views/select_file_dialog_extension.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 42 matching lines @@
 class PendingDialog {
  public:
   static PendingDialog* GetInstance();
   void Add(SelectFileDialogExtension::RoutingID id,
            scoped_refptr<SelectFileDialogExtension> dialog);
   void Remove(SelectFileDialogExtension::RoutingID id);
   scoped_refptr<SelectFileDialogExtension> Find(
       SelectFileDialogExtension::RoutingID id);
 
  private:
-  friend struct DefaultSingletonTraits<PendingDialog>;
+  friend struct base::DefaultSingletonTraits<PendingDialog>;
   typedef std::map<SelectFileDialogExtension::RoutingID,
                    scoped_refptr<SelectFileDialogExtension> > Map;
   Map map_;
 };
 
 // static
 PendingDialog* PendingDialog::GetInstance() {
-  return Singleton<PendingDialog>::get();
+  return base::Singleton<PendingDialog>::get();
 }
 
 void PendingDialog::Add(SelectFileDialogExtension::RoutingID id,
                         scoped_refptr<SelectFileDialogExtension> dialog) {
   DCHECK(dialog.get());
   if (map_.find(id) == map_.end())
     map_.insert(std::make_pair(id, dialog));
   else
     DLOG(WARNING) << "Duplicate pending dialog " << id;
 }
@@ skipping 339 matching lines @@
   }
 
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   AddPending(routing_id);
 
   extension_dialog_ = dialog;
   params_ = params;
   routing_id_ = routing_id;
   owner_window_ = owner_window;
 }