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

chrome_frame/protocol_sink_wrap.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 <htiframe.h>
 #include <mshtml.h>
 
 #include "chrome_frame/protocol_sink_wrap.h"
 
 #include "base/logging.h"
@@ skipping 214 matching lines @@
     "video/webm",
     "video/mp4"
   };
 
   const std::wstring str = status_text;
   for (int i = 0; i < arraysize(kHeaderContentTypes); ++i) {
     if (LowerCaseEqualsASCII(str, kHeaderContentTypes[i]))
       return true;
   }
 
-  Singleton<PolicySettings> policy;
-  if (policy->GetRendererForContentType(status_text) ==
-      PolicySettings::RENDER_IN_CHROME_FRAME) {
+  if (PolicySettings::GetInstance()->GetRendererForContentType(
+      status_text) == PolicySettings::RENDER_IN_CHROME_FRAME) {
     return true;
   }
 
   return false;
 }
 
 // Returns:
 // RENDERER_TYPE_OTHER: if suggested mime type is not text/html.
 // RENDERER_TYPE_UNDETERMINED: if suggested mime type is text/html.
 // RENDERER_TYPE_CHROME_RESPONSE_HEADER: X-UA-Compatible tag is in HTTP headers.
@@ skipping 680 matching lines @@
     // Explicit release, otherwise ~CComObjectStackEx will complain about
     // outstanding reference to us, because it runs before ~FakeProtocol
     prot.transaction_.Release();
   }
 }
 
 void TransactionHooks::RevertHooks() {
   vtable_patch::UnpatchInterfaceMethods(CTransaction_PatchInfo);
   vtable_patch::UnpatchInterfaceMethods(CTransaction2_PatchInfo);
 }