Remove deprecated versions of Registry functions.

chrome/browser/importer/ie_importer.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/browser/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 441 matching lines @@
     return false;
   info->path = buffer;
 
   // There is a Links folder under Favorites folder in Windows Vista, but it
   // is not recording in Vista's registry. So in Vista, we assume the Links
   // folder is under Favorites folder since it looks like there is not name
   // different in every language version of Windows Vista.
   if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
     // The Link folder name is stored in the registry.
     DWORD buffer_length = sizeof(buffer);
-    if (!ReadFromRegistry(HKEY_CURRENT_USER,
-            L"Software\\Microsoft\\Internet Explorer\\Toolbar",
-            L"LinksFolderName", buffer, &buffer_length))
+    RegKey reg_key(HKEY_CURRENT_USER,
+                   L"Software\\Microsoft\\Internet Explorer\\Toolbar");
+    if (reg_key.ReadValue(L"LinksFolderName", buffer, &buffer_length, NULL))
       return false;
     info->links_folder = buffer;
   } else {
     info->links_folder = L"Links";
   }
 
   return true;
 }
 
 void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
@@ skipping 86 matching lines @@
     return std::wstring();
 
   return std::wstring(url);
 }
 
 int IEImporter::CurrentIEVersion() const {
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
-    bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE,
-        L"Software\\Microsoft\\Internet Explorer",
-        L"Version", buffer, &buffer_length);
+    RegKey reg_key(HKEY_LOCAL_MACHINE,
+                   L"Software\\Microsoft\\Internet Explorer");
+    bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = (result ? _wtoi(buffer) : 0);
   }
   return version;
 }