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

chrome/installer/util/delete_after_reboot_helper_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 <windows.h>
 #include <shlobj.h>
 
 #include "base/file_util.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/win/registry.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // These tests exercise the Delete-After-Reboot code which requires
 // modifications to HKLM. This will fail on Vista and above if the user
 // is not an admin or if UAC is on.
 // I tried using RegOverridePredefKey to test, but MoveFileEx ignore this
 // even on 32 bit machines :-( As such, running this test may pollute
@@ skipping 14 matching lines @@
     if (IsUserAnAdmin()) {
       GetPendingMovesValue(&original_pending_moves_);
     }
   }
   virtual void TearDown() {
     // Delete the temporary directory if it's still there.
     file_util::Delete(temp_dir_, true);
 
     // Try and restore the pending moves value, if we have one.
     if (IsUserAnAdmin() && original_pending_moves_.size() > 1) {
-      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.
         DLOG(ERROR) << "Failed to open session manager key for writing.";
       }
 
       std::vector<char> buffer;
       StringArrayToMultiSZBytes(original_pending_moves_, &buffer);
       session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
                                      buffer.size(), REG_MULTI_SZ);
     }
@@ skipping 119 matching lines @@
   // Test that we can remove the pending deletes.
   EXPECT_TRUE(RemoveFromMovesPendingReboot(temp_dir_.value().c_str()));
   HRESULT hr = GetPendingMovesValue(&pending_moves);
   EXPECT_TRUE(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND));
 
   std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin());
   for (; check_iter != pending_moves.end(); ++check_iter) {
     EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, check_iter->first));
   }
 }