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

chrome_frame/test/chrome_frame_test_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/test/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/registry.h"   // to find IE and firefox
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
+#include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/utils.h"
 
 namespace chrome_frame_test {
 
 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
 
@@ skipping 75 matching lines @@
   }
 
   return window_close_attempts;
 }
 
 std::wstring GetExecutableAppPath(const std::wstring& file) {
   std::wstring kAppPathsKey =
       L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\";
 
   std::wstring app_path;
-  RegKey key(HKEY_LOCAL_MACHINE, (kAppPathsKey + file).c_str(), KEY_READ);
+  base::win::RegKey key(HKEY_LOCAL_MACHINE, (kAppPathsKey + file).c_str(),
+                        KEY_READ);
   if (key.Handle()) {
     key.ReadValue(NULL, &app_path);
   }
 
   return app_path;
 }
 
 std::wstring FormatCommandForApp(const std::wstring& exe_name,
                                  const std::wstring& argument) {
   std::wstring reg_path(
       base::StringPrintf(L"Applications\\%ls\\shell\\open\\command",
                          exe_name.c_str()));
-  RegKey key(HKEY_CLASSES_ROOT, reg_path.c_str(), KEY_READ);
+  base::win::RegKey key(HKEY_CLASSES_ROOT, reg_path.c_str(), KEY_READ);
 
   std::wstring command;
   if (key.Handle()) {
     key.ReadValue(NULL, &command);
     int found = command.find(L"%1");
     if (found >= 0) {
       command.replace(found, 2, argument);
     }
   }
   return command;
@@ skipping 446 matching lines @@
     // First check to see if it's even still running just to minimize the
     // likelihood of spurious error messages from KillProcess.
     if (WAIT_OBJECT_0 != ::WaitForSingleObject(crash_service, 0)) {
       base::KillProcess(crash_service, 0, false);
     }
     return NULL;
   }
 }
 
 }  // namespace chrome_frame_test