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

chrome/installer/util/install_util.h

 // 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.
 //
 // This file declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #pragma once
 
 #include <tchar.h>
 #include <windows.h>
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/version.h"
 
 class WorkItemList;
+
+namespace base {
+namespace win {
 class RegKey;
+}  // namespace win
+}  // namespace base
 
 // This is a utility class that provides common installation related
 // utility methods that can be used by installer and also unit tested
 // independently.
 class InstallUtil {
  public:
   // Launches given exe as admin on Vista.
   static bool ExecuteExeAsAdmin(const std::wstring& exe,
                                 const std::wstring& params,
                                 DWORD* exit_code);
@@ skipping 65 matching lines @@
   // Returns true if at least one DLL was successfully added to
   // registration_list.
   static bool BuildDLLRegistrationList(const std::wstring& install_path,
                                        const wchar_t** const dll_names,
                                        int dll_names_count,
                                        bool do_register,
                                        bool user_level_registration,
                                        WorkItemList* registration_list);
 
   // Deletes the registry key at path key_path under the key given by root_key.
-  static bool DeleteRegistryKey(RegKey& root_key, const std::wstring& key_path);
+  static bool DeleteRegistryKey(base::win::RegKey& root_key,
+                                const std::wstring& key_path);
 
   // Deletes the registry value named value_name at path key_path under the key
   // given by reg_root.
   static bool DeleteRegistryValue(HKEY reg_root, const std::wstring& key_path,
                                   const std::wstring& value_name);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__