Move Singleton and related structs to namespace base

components/tracing/trace_config_file.cc

 // Copyright (c) 2015 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 "components/tracing/trace_config_file.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 23 matching lines @@
     FILE_PATH_LITERAL("chrometrace.log");
 
 // String parameters that can be used to parse the trace config file content.
 const char kTraceConfigParam[] = "trace_config";
 const char kStartupDurationParam[] = "startup_duration";
 const char kResultFileParam[] = "result_file";
 
 } // namespace
 
 TraceConfigFile* TraceConfigFile::GetInstance() {
-  return Singleton<TraceConfigFile,
-                   DefaultSingletonTraits<TraceConfigFile>>::get();
+  return base::Singleton<TraceConfigFile,
+                         base::DefaultSingletonTraits<TraceConfigFile>>::get();
 }
 
 TraceConfigFile::TraceConfigFile()
     : is_enabled_(false),
       trace_config_(base::trace_event::TraceConfig()),
       startup_duration_(0),
       result_file_(kDefaultResultFile) {
 #if defined(OS_ANDROID)
   base::FilePath trace_config_file(kAndroidTraceConfigFile);
 #else
@@ skipping 75 matching lines @@
 }
 
 #if !defined(OS_ANDROID)
 base::FilePath TraceConfigFile::GetResultFile() const {
   DCHECK(IsEnabled());
   return result_file_;
 }
 #endif
 
 }  // namespace tracing