Cleanup our Registry API.

chrome/browser/importer/firefox_importer_utils_win.cc

Index: chrome/browser/importer/firefox_importer_utils_win.cc
diff --git a/chrome/browser/importer/firefox_importer_utils_win.cc b/chrome/browser/importer/firefox_importer_utils_win.cc
index 77e3fcbad4d2f0e9b30f5173bd24a7226721cda7..6887067e28b5948bed090c6aee21ba11cdd2c730 100644
--- a/chrome/browser/importer/firefox_importer_utils_win.cc
+++ b/chrome/browser/importer/firefox_importer_utils_win.cc
@@ -43,7 +43,7 @@ int GetCurrentFirefoxMajorVersionFromRegistry() {
 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,
@@ -52,7 +52,7 @@ std::wstring GetFirefoxInstallPathFromRegistry() {
     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)