Move pe_image and registry from base to base/win and use the namespace. It re...

chrome_frame/test/policy_settings_unittest.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 "base/basictypes.h"
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
 #include "chrome/common/policy_constants.h"
 #include "chrome_frame/policy_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::win::RegKey;
+
 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::kRegistrySubKey, KEY_ALL_ACCESS)) {
     key.DeleteValue(
         ASCIIToWide(policy::key::kChromeFrameRendererSettings).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kRenderInChromeFrameList).c_str());
     key.DeleteKey(ASCIIToWide(policy::key::kRenderInHostList).c_str());
@@ skipping 181 matching lines @@
                     kTestPolicyContentTypes[type]));
     }
 
     EXPECT_EQ(PolicySettings::RENDERER_NOT_SPECIFIED,
               settings->GetRendererForContentType(L"text/html"));
 
     DeleteChromeFramePolicyEntries(root[i]);
   }
 }