Make members of Singleton<T> private and only visible to the singleton type. This enforces that the Singleton<T> pattern can only be used within classes which want singleton-ness.

As part of this CL I have also fixed up files which got missed in my previous CLs to use a GetInstance() method and use Singleton<T> from the source file.

There are a small number of places where I have also switched to LazyInstance as that was more appropriate for types used in a single source file.

BUG=65298
TEST=all existing tests should continue to pass.

Review URL: http://codereview.chromium.org/5682008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68932 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index e505165..581a0db 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -11,17 +11,20 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/singleton.h"
 #include "base/thread.h"
 
+template <typename T> struct DefaultSingletonTraits;
 class WtlVideoRenderer;
 
 namespace media {
 
 class PipelineImpl;
 
-class Movie : public Singleton<Movie> {
+class Movie {
  public:
+   // Returns the singleton instance.
+  static Movie* GetInstance();
+
   // Open a movie.
   bool Open(const wchar_t* url, WtlVideoRenderer* video_renderer);