Add a new GetInstance() method for singleton classes, take 2.

ceee/ie/plugin/bho/cookie_accountant.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.
 //
 // Defines the CookieAccountant class, which is responsible for observing
 // and recording all cookie-related information generated by a particular
 // IE browser session. It records and fires cookie change events, it provides
 // access to session and persistent cookies.
 
 #ifndef CEEE_IE_PLUGIN_BHO_COOKIE_ACCOUNTANT_H_
@@ skipping 107 matching lines @@
 
   // The funnel for sending cookie events to the broker.
   CookieEventsFunnel cookie_events_funnel_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieAccountant);
 };
 
 // A singleton that initializes and keeps the CookieAccountant used by
 // production code. This class is separate so that CookieAccountant can still
 // be accessed for unit testing.
-class ProductionCookieAccountant : public CookieAccountant,
-    public Singleton<ProductionCookieAccountant> {
+class ProductionCookieAccountant : public CookieAccountant {
+ public:
+  static ProductionCookieAccountant* GetInstance();
+
  private:
   // This ensures no construction is possible outside of the class itself.
   friend struct DefaultSingletonTraits<ProductionCookieAccountant>;
   DISALLOW_IMPLICIT_CONSTRUCTORS(ProductionCookieAccountant);
 };
 
 #endif  // CEEE_IE_PLUGIN_BHO_COOKIE_ACCOUNTANT_H_