Move Singleton and related structs to namespace base

content/browser/histogram_synchronizer.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 "content/browser/histogram_synchronizer.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 162 matching lines @@
 }
 
 HistogramSynchronizer::~HistogramSynchronizer() {
   RequestContext::OnShutdown();
 
   // Just in case we have any pending tasks, clear them out.
   SetCallbackTaskAndThread(NULL, base::Closure());
 }
 
 HistogramSynchronizer* HistogramSynchronizer::GetInstance() {
-  return Singleton<HistogramSynchronizer,
-      LeakySingletonTraits<HistogramSynchronizer> >::get();
+  return base::Singleton<
+      HistogramSynchronizer,
+      base::LeakySingletonTraits<HistogramSynchronizer>>::get();
 }
 
 // static
 void HistogramSynchronizer::FetchHistograms() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&HistogramSynchronizer::FetchHistograms));
     return;
   }
@@ skipping 141 matching lines @@
         kHistogramSynchronizerReservedSequenceNumber + 1;
   }
   DCHECK_NE(last_used_sequence_number_,
             kHistogramSynchronizerReservedSequenceNumber);
   if (requester == ASYNC_HISTOGRAMS)
     async_sequence_number_ = last_used_sequence_number_;
   return last_used_sequence_number_;
 }
 
 }  // namespace content