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

chrome_frame/utils.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 "chrome_frame/utils.h"
 
 #include <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 
@@ skipping 705 matching lines @@
                       KEY_WRITE)) {
     return config_key.DeleteValue(value_name);
   }
   return false;
 }
 
 bool IsGcfDefaultRenderer() {
   DWORD is_default = 0;  // NOLINT
 
   // First check policy settings
-  Singleton<PolicySettings> policy;
-  PolicySettings::RendererForUrl renderer = policy->default_renderer();
+  PolicySettings::RendererForUrl renderer =
+      PolicySettings::GetInstance()->default_renderer();
   if (renderer != PolicySettings::RENDERER_NOT_SPECIFIED) {
     is_default = (renderer == PolicySettings::RENDER_IN_CHROME_FRAME);
   } else {
     // TODO(tommi): Implement caching for this config value as it gets
     // checked frequently.
     RegKey config_key;
     if (config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_READ)) {
       config_key.ReadValueDW(kEnableGCFRendererByDefault, &is_default);
     }
   }
 
   return is_default != 0;
 }
 
 RendererType RendererTypeForUrl(const std::wstring& url) {
   // First check if the default renderer settings are specified by policy.
   // If so, then that overrides the user settings.
-  Singleton<PolicySettings> policy;
-  PolicySettings::RendererForUrl renderer = policy->GetRendererForUrl(
-      url.c_str());
+  PolicySettings::RendererForUrl renderer =
+      PolicySettings::GetInstance()->GetRendererForUrl(url.c_str());
   if (renderer != PolicySettings::RENDERER_NOT_SPECIFIED) {
     // We may know at this point that policy says do NOT render in Chrome Frame.
     // To maintain consistency, we return RENDERER_TYPE_UNDETERMINED so that
     // content sniffing, etc. still take place.
     // TODO(tommi): Clarify the intent here.
     return (renderer == PolicySettings::RENDER_IN_CHROME_FRAME) ?
         RENDERER_TYPE_CHROME_OPT_IN_URL : RENDERER_TYPE_UNDETERMINED;
   }
 
   RegKey config_key;
@@ skipping 816 matching lines @@
 
 void EnumerateKeyValues(HKEY parent_key, const wchar_t* sub_key_name,
                         std::vector<std::wstring>* values) {
   DCHECK(values);
   base::win::RegistryValueIterator url_list(parent_key, sub_key_name);
   while (url_list.Valid()) {
     values->push_back(url_list.Value());
     ++url_list;
   }
 }