Move Singleton and related structs to namespace base

chrome/browser/diagnostics/diagnostics_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_CONTROLLER_H_
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_CONTROLLER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 
@@ skipping 29 matching lines @@
   // Clears any results that have accumulated. After calling this, do not call
   // GetResults until after Run is called again.
   void ClearResults();
 
   // Records UMA statistics indicating that a regular Chrome startup happened,
   // with no diagnostics or recovery being run.  This is necessary to provide a
   // denominator for the diagnostics metrics.
   void RecordRegularStartup();
 
  private:
-  friend struct DefaultSingletonTraits<DiagnosticsController>;
+  friend struct base::DefaultSingletonTraits<DiagnosticsController>;
 
   DiagnosticsController();
   ~DiagnosticsController();
 
   scoped_ptr<DiagnosticsModel> model_;
   DiagnosticsWriter* writer_;
 
   DISALLOW_COPY_AND_ASSIGN(DiagnosticsController);
 };
 
 }  // namespace diagnostics
 
 #endif  // CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_CONTROLLER_H_