Change PolicyLoaderWin to load PReg files if possible.

chrome_frame/test/policy_settings_unittest.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 "base/at_exit.h"
 #include "base/basictypes.h"
-#include "base/at_exit.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome_frame/policy_settings.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "content/public/common/content_switches.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 using chrome_frame_test::ScopedVirtualizeHklmAndHkcu;
 
 namespace {
 
 // A best effort way to zap CF policy entries that may be in the registry.
 void DeleteChromeFramePolicyEntries(HKEY root) {
   RegKey key;
-  if (key.Open(root, policy::kRegistryMandatorySubKey,
+  if (key.Open(root, policy::kRegistryChromePolicyKey,
                KEY_ALL_ACCESS) == ERROR_SUCCESS) {
     key.DeleteValue(
         ASCIIToWide(policy::key::kChromeFrameRendererSettings).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kRenderInChromeFrameList).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kRenderInHostList).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kChromeFrameContentTypes).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kApplicationLocaleValue).c_str());
   }
 }
 
 bool InitializePolicyKey(HKEY policy_root, RegKey* policy_key) {
   EXPECT_EQ(ERROR_SUCCESS, policy_key->Create(policy_root,
-      policy::kRegistryMandatorySubKey, KEY_ALL_ACCESS));
+      policy::kRegistryChromePolicyKey, KEY_ALL_ACCESS));
   return policy_key->Valid();
 }
 
 void WritePolicyList(RegKey* policy_key,
                      const wchar_t* list_name,
                      const wchar_t* values[], int count) {
   DCHECK(policy_key);
   // Remove any previous settings
   policy_key->DeleteKey(list_name);
 
@@ skipping 188 matching lines @@
 
     base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe"));
     CommandLine new_cmd_line(program_path);
     new_cmd_line.AppendArguments(additional_params, false);
     EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram());
     EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource));
 
     DeleteChromeFramePolicyEntries(root[i]);
   }
 }