Remove deprecated versions of Registry functions.

chrome/browser/importer/firefox_importer_utils_win.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 "chrome/browser/importer/firefox_importer_utils.h"
 
 #include <shlobj.h>
 
 #include "base/file_util.h"
 #include "base/registry.h"
 
 // NOTE: Keep these in order since we need test all those paths according
 // to priority. For example. One machine has multiple users. One non-admin
 // user installs Firefox 2, which causes there is a Firefox2 entry under HKCU.
 // One admin user installs Firefox 3, which causes there is a Firefox 3 entry
 // under HKLM. So when the non-admin user log in, we should deal with Firefox 2
 // related data instead of Firefox 3.
 static const HKEY kFireFoxRegistryPaths[] = {
   HKEY_CURRENT_USER,
   HKEY_LOCAL_MACHINE
 };
 
 int GetCurrentFirefoxMajorVersionFromRegistry() {
   TCHAR ver_buffer[128];
   DWORD ver_buffer_length = sizeof(ver_buffer);
   int highest_version = 0;
   // When installing Firefox with admin account, the product keys will be
   // written under HKLM\Mozilla. Otherwise it the keys will be written under
   // HKCU\Mozilla.
   for (int i = 0; i < arraysize(kFireFoxRegistryPaths); ++i) {
-    bool result = ReadFromRegistry(kFireFoxRegistryPaths[i],
-        L"Software\\Mozilla\\Mozilla Firefox",
-        L"CurrentVersion", ver_buffer, &ver_buffer_length);
+    RegKey reg_key(kFireFoxRegistryPaths[i],
+                   L"Software\\Mozilla\\Mozilla Firefox");
+
+    bool result = reg_key.ReadValue(L"CurrentVersion", ver_buffer,
+                                    &ver_buffer_length, NULL);
     if (!result)
       continue;
     highest_version = std::max(highest_version, _wtoi(ver_buffer));
   }
   return highest_version;
 }
 
 std::wstring GetFirefoxInstallPathFromRegistry() {
   // Detects the path that Firefox is installed in.
   std::wstring registry_path = L"Software\\Mozilla\\Mozilla Firefox";
   TCHAR buffer[MAX_PATH];
   DWORD buffer_length = sizeof(buffer);
-  bool result;
-  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
-                            L"CurrentVersion", buffer, &buffer_length);
+  RegKey reg_key(HKEY_LOCAL_MACHINE, registry_path.c_str());
+  bool result = reg_key.ReadValue(L"CurrentVersion", buffer,
+                                  &buffer_length, NULL);
   if (!result)
     return std::wstring();
   registry_path += L"\\" + std::wstring(buffer) + L"\\Main";
   buffer_length = sizeof(buffer);
-  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
-                            L"Install Directory", buffer, &buffer_length);
+  reg_key = RegKey(HKEY_LOCAL_MACHINE, registry_path.c_str());
+  result = reg_key.ReadValue(L"Install Directory", buffer,
+                             &buffer_length, NULL);
   if (!result)
     return std::wstring();
   return buffer;
 }
 
 FilePath GetProfilesINI() {
   FilePath ini_file;
   // The default location of the profile folder containing user data is
   // under the "Application Data" folder in Windows XP.
   wchar_t buffer[MAX_PATH] = {0};
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
                                 SHGFP_TYPE_CURRENT, buffer))) {
     ini_file = FilePath(buffer).Append(L"Mozilla\\Firefox\\profiles.ini");
   }
   if (file_util::PathExists(ini_file))
     return ini_file;
 
   return FilePath();
 }