Move Singleton and related structs to namespace base

chrome/browser/diagnostics/diagnostics_controller.cc

 // Copyright 2013 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/diagnostics/diagnostics_controller.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 #include "chrome/common/chrome_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 namespace diagnostics {
 
 DiagnosticsController* DiagnosticsController::GetInstance() {
-  return Singleton<DiagnosticsController>::get();
+  return base::Singleton<DiagnosticsController>::get();
 }
 
 DiagnosticsController::DiagnosticsController() : writer_(NULL) {}
 
 DiagnosticsController::~DiagnosticsController() {}
 
 const DiagnosticsModel& DiagnosticsController::GetResults() const {
   return *model_;
 }
 
@@ skipping 57 matching lines @@
     return -1;
   }
 
   writer_ = writer;
 
   model_->RecoverAll(writer_);
   return 0;
 }
 
 }  // namespace diagnostics