Change PolicyLoaderWin to load PReg files if possible.

chrome_frame/policy_settings.cc

 // Copyright (c) 2012 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/policy_settings.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 56 matching lines @@
   DCHECK(renderer_exclusion_list);
 
   *default_renderer = RENDERER_NOT_SPECIFIED;
   renderer_exclusion_list->clear();
 
   base::win::RegKey config_key;
   DWORD value = RENDERER_NOT_SPECIFIED;
   std::wstring settings_value(
       ASCIIToWide(policy::key::kChromeFrameRendererSettings));
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
-    if ((config_key.Open(kRootKeys[i], policy::kRegistryMandatorySubKey,
+    if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
                          KEY_READ) == ERROR_SUCCESS) &&
         (config_key.ReadValueDW(settings_value.c_str(),
                                 &value) == ERROR_SUCCESS)) {
         break;
     }
   }
 
   DCHECK(value == RENDERER_NOT_SPECIFIED ||
          value == RENDER_IN_HOST ||
          value == RENDER_IN_CHROME_FRAME) <<
@@ skipping 14 matching lines @@
              << *default_renderer
              << " exclusion list size: " << renderer_exclusion_list->size();
   }
 }
 
 // static
 void PolicySettings::ReadContentTypeSetting(
     std::vector<std::wstring>* content_type_list) {
   DCHECK(content_type_list);
 
-  std::wstring sub_key(policy::kRegistryMandatorySubKey);
+  std::wstring sub_key(policy::kRegistryChromePolicyKey);
   sub_key += L"\\";
   sub_key += ASCIIToWide(policy::key::kChromeFrameContentTypes);
 
   content_type_list->clear();
   for (int i = 0; i < arraysize(kRootKeys) && content_type_list->empty();
        ++i) {
     EnumerateKeyValues(kRootKeys[i], sub_key.c_str(), content_type_list);
   }
 }
 
 // static
 void PolicySettings::ReadStringSetting(const char* value_name,
                                        std::wstring* value) {
   DCHECK(value);
   value->clear();
   base::win::RegKey config_key;
   std::wstring value_name_str(ASCIIToWide(value_name));
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
-    if ((config_key.Open(kRootKeys[i], policy::kRegistryMandatorySubKey,
+    if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
                          KEY_READ) == ERROR_SUCCESS) &&
         (config_key.ReadValue(value_name_str.c_str(),
                               value) == ERROR_SUCCESS)) {
       break;
     }
   }
 }
 
 void PolicySettings::RefreshFromRegistry() {
   RendererForUrl default_renderer;
@@ skipping 22 matching lines @@
   swap(renderer_exclusion_list_, renderer_exclusion_list);
   swap(content_type_list_, content_type_list);
   swap(application_locale_, application_locale);
   swap(additional_launch_parameters_, additional_launch_parameters);
 }
 
 // static
 PolicySettings* PolicySettings::GetInstance() {
   return Singleton<PolicySettings>::get();
 }