Cleanup our Registry API.

chrome/browser/importer/firefox_importer_utils_win.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/firefox_importer_utils.h"
 
 #include <shlobj.h>
 
 #include "base/file_util.h"
 #include "base/registry.h"
@@ skipping 25 matching lines @@
     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];
+  wchar_t buffer[MAX_PATH];
   DWORD buffer_length = sizeof(buffer);
   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);
-  RegKey reg_key_directory = RegKey(HKEY_LOCAL_MACHINE, registry_path.c_str());
+  RegKey reg_key_directory(HKEY_LOCAL_MACHINE, registry_path.c_str());
   result = reg_key_directory.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();
 }