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

media/tools/player_wtl/movie.h

 // 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.
 
 // Movie class for WTL forms to call to control the media pipeline.
 
 #ifndef MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
 #define MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
 
 #include "media/tools/player_wtl/player_wtl.h"
 
 #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);
 
   // Set playback rate.
   void Play(float rate);
 
   // Set playback rate.
   float GetPlayRate();
 
   // Get movie duration in seconds.
@@ skipping 55 matching lines @@
   float play_rate_;
   HBITMAP movie_dib_;
   HWND movie_hwnd_;
 
   DISALLOW_COPY_AND_ASSIGN(Movie);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_