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

net/base/bandwidth_metrics.cc

Index: net/base/bandwidth_metrics.cc
diff --git a/net/base/bandwidth_metrics.cc b/net/base/bandwidth_metrics.cc
index eaaa3c01b89a267881f076d01ddbe4fc67b9afb1..a9e987915adbd5ee8b02854ff8274424051659b8 100644
--- a/net/base/bandwidth_metrics.cc
+++ b/net/base/bandwidth_metrics.cc
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "net/base/bandwidth_metrics.h"
 
+static base::LazyInstance<net::BandwidthMetrics> g_bandwidth_metrics(
+    base::LINKER_INITIALIZED);
+
 namespace net {
 
 ScopedBandwidthMetrics::ScopedBandwidthMetrics()
-    : metrics_(Singleton<BandwidthMetrics>::get()),
+    : metrics_(g_bandwidth_metrics.Pointer()),

[M-A Ruel, 2010/12/10 14:52:18]

I'm wondering about the usefulness of the metrics_ variable at all. Unless it is
used for mocking but I didn't see a unit test at first glance.

[Satish, 2010/12/10 15:04:57]

I'll move the implementation of this class's methods to this cc file and with
that the metrics_ variable can be removed and g_bandwidth_metrics used instead.

[M-A Ruel, 2010/12/10 15:09:42]

Cool

[Satish, 2010/12/10 17:13:48]

Done.

       started_(false) {
 }