Move Singleton and related structs to namespace base

ui/base/clipboard/clipboard_aurax11.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 "ui/base/clipboard/clipboard_aurax11.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xatom.h>
 #include <list>
 #include <set>
@@ skipping 53 matching lines @@
 class SelectionChangeObserver : public ui::PlatformEventObserver {
  public:
   static SelectionChangeObserver* GetInstance();
 
   uint64 clipboard_sequence_number() const {
     return clipboard_sequence_number_;
   }
   uint64 primary_sequence_number() const { return primary_sequence_number_; }
 
  private:
-  friend struct DefaultSingletonTraits<SelectionChangeObserver>;
+  friend struct base::DefaultSingletonTraits<SelectionChangeObserver>;
 
   SelectionChangeObserver();
   ~SelectionChangeObserver() override;
 
   // ui::PlatformEventObserver:
   void WillProcessEvent(const ui::PlatformEvent& event) override;
   void DidProcessEvent(const ui::PlatformEvent& event) override {}
 
   int event_base_;
   Atom clipboard_atom_;
@@ skipping 27 matching lines @@
 
     ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
   }
 }
 
 SelectionChangeObserver::~SelectionChangeObserver() {
   // We are a singleton; we will outlive the event source.
 }
 
 SelectionChangeObserver* SelectionChangeObserver::GetInstance() {
-  return Singleton<SelectionChangeObserver>::get();
+  return base::Singleton<SelectionChangeObserver>::get();
 }
 
 void SelectionChangeObserver::WillProcessEvent(const ui::PlatformEvent& event) {
   if (event->type == event_base_ + XFixesSelectionNotify) {
     XFixesSelectionNotifyEvent* ev =
         reinterpret_cast<XFixesSelectionNotifyEvent*>(event);
     if (ev->selection == clipboard_atom_) {
       clipboard_sequence_number_++;
     } else if (ev->selection == XA_PRIMARY) {
       primary_sequence_number_++;
@@ skipping 797 matching lines @@
   if (format.Equals(GetBitmapFormatType()))
     return;
 
   std::vector<unsigned char> bytes(data_data, data_data + data_len);
   scoped_refptr<base::RefCountedMemory> mem(
       base::RefCountedBytes::TakeVector(&bytes));
   aurax11_details_->InsertMapping(format.ToString(), mem);
 }
 
 }  // namespace ui