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

chrome/installer/util/delete_after_reboot_helper.cc

 // Copyright (c) 2009 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 defines helper methods used to schedule files for deletion
 // on next reboot. The code here is heavily borrowed and simplified from
 //  http://code.google.com/p/omaha/source/browse/trunk/common/file.cc and
 //  http://code.google.com/p/omaha/source/browse/trunk/common/utils.cc
 //
 // This implementation really is not fast, so do not use it where that will
 // matter.
 
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/registry.h"
+#include "base/win/registry.h"
 #include "base/string_util.h"
 
 // The moves-pending-reboot is a MULTISZ registry key in the HKLM part of the
 // registry.
 const wchar_t kSessionManagerKey[] =
     L"SYSTEM\\CurrentControlSet\\Control\\Session Manager";
 const wchar_t kPendingFileRenameOps[] = L"PendingFileRenameOperations";
 
 namespace {
 
@@ skipping 208 matching lines @@
   return short_path;
 }
 
 HRESULT GetPendingMovesValue(
     std::vector<PendingMove>* pending_moves) {
   DCHECK(pending_moves);
   pending_moves->clear();
 
   // Get the current value of the key
   // If the Key is missing, that's totally acceptable.
-  RegKey session_manager_key(HKEY_LOCAL_MACHINE, kSessionManagerKey,
-                             KEY_QUERY_VALUE);
+  base::win::RegKey session_manager_key(HKEY_LOCAL_MACHINE, kSessionManagerKey,
+                                        KEY_QUERY_VALUE);
   HKEY session_manager_handle = session_manager_key.Handle();
   if (!session_manager_handle) {
     return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
   }
 
   // The base::RegKey Read code squashes the return code from
   // ReqQueryValueEx, we have to do things ourselves:
   DWORD buffer_size = 0;
   std::vector<char> buffer;
   buffer.resize(1);
@@ skipping 84 matching lines @@
       strings_to_keep.push_back(*iter);
     }
   }
 
   if (strings_to_keep.size() == pending_moves.size()) {
     // Nothing to remove, return true.
     return true;
   }
 
   // Write the key back into a buffer.
-  RegKey session_manager_key(HKEY_LOCAL_MACHINE, kSessionManagerKey,
-                             KEY_CREATE_SUB_KEY | KEY_SET_VALUE);
+  base::win::RegKey session_manager_key(HKEY_LOCAL_MACHINE, kSessionManagerKey,
+                                        KEY_CREATE_SUB_KEY | KEY_SET_VALUE);
   if (!session_manager_key.Handle()) {
     // Couldn't open / create the key.
     LOG(ERROR) << "Failed to open session manager key for writing.";
     return false;
   }
 
   if (strings_to_keep.size() > 1) {
     std::vector<char> buffer;
     StringArrayToMultiSZBytes(strings_to_keep, &buffer);
     DCHECK(buffer.size() > 0);
     if (buffer.size() > 0) {
       return session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
                                             buffer.size(), REG_MULTI_SZ);
     } else {
       return false;
     }
   } else {
     // We have only the trailing NULL string. Don't bother writing that.
     return session_manager_key.DeleteValue(kPendingFileRenameOps);
   }
 }