Make members of Singleton<T> private and only visible to the singleton type.

printing/printed_document.cc

 // Copyright (c) 2010 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 "printing/printed_document.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/text_elider.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
+#include "base/lazy_instance.h"
 #include "base/message_loop.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "gfx/font.h"
 #include "printing/page_number.h"
 #include "printing/page_overlays.h"
 #include "printing/printed_pages_source.h"
 #include "printing/printed_page.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
 
 namespace {
 
 struct PrintDebugDumpPath {
   PrintDebugDumpPath()
     : enabled(false) {
   }
 
   bool enabled;
   FilePath debug_dump_path;
 };
 
-Singleton<PrintDebugDumpPath> g_debug_dump_info;
+static base::LazyInstance<PrintDebugDumpPath> g_debug_dump_info(
+    base::LINKER_INITIALIZED);
 
 }  // namespace
 
 namespace printing {
 
 PrintedDocument::PrintedDocument(const PrintSettings& settings,
                                  PrintedPagesSource* source,
                                  int cookie)
     : mutable_(source),
       immutable_(settings, source, cookie) {
@@ skipping 186 matching lines @@
     } else {
       output = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(output),
           font, bounding.width(), false));
     }
   }
 
   DrawHeaderFooter(context, output, bounding);
 }
 
 void PrintedDocument::DebugDump(const PrintedPage& page) {
-  if (!g_debug_dump_info->enabled)
+  if (!g_debug_dump_info.Get().enabled)
     return;
 
   string16 filename;
   filename += date();
   filename += ASCIIToUTF16("_");
   filename += time();
   filename += ASCIIToUTF16("_");
   filename += name();
   filename += ASCIIToUTF16("_");
   filename += ASCIIToUTF16(StringPrintf("%02d", page.page_number()));
   filename += ASCIIToUTF16("_.emf");
 #if defined(OS_WIN)
   page.native_metafile()->SaveTo(
-      g_debug_dump_info->debug_dump_path.Append(filename).ToWStringHack());
+      g_debug_dump_info.Get().debug_dump_path.Append(filename).ToWStringHack());
 #else  // OS_WIN
   NOTIMPLEMENTED();
 #endif  // OS_WIN
 }
 
 void PrintedDocument::set_debug_dump_path(const FilePath& debug_dump_path) {
-  g_debug_dump_info->enabled = !debug_dump_path.empty();
-  g_debug_dump_info->debug_dump_path = debug_dump_path;
+  g_debug_dump_info.Get().enabled = !debug_dump_path.empty();
+  g_debug_dump_info.Get().debug_dump_path = debug_dump_path;
 }
 
 const FilePath& PrintedDocument::debug_dump_path() {
-  return g_debug_dump_info->debug_dump_path;
+  return g_debug_dump_info.Get().debug_dump_path;
 }
 
 PrintedDocument::Mutable::Mutable(PrintedPagesSource* source)
     : source_(source),
       expected_page_count_(0),
       page_count_(0),
       shrink_factor(0) {
 }
 
 PrintedDocument::Mutable::~Mutable() {
 }
 
 PrintedDocument::Immutable::Immutable(const PrintSettings& settings,
                                       PrintedPagesSource* source,
                                       int cookie)
     : settings_(settings),
       source_message_loop_(MessageLoop::current()),
       name_(source->RenderSourceName()),
       url_(source->RenderSourceUrl()),
       cookie_(cookie) {
   SetDocumentDate();
 }
 
 PrintedDocument::Immutable::~Immutable() {
 }
 
 }  // namespace printing