Don't use internet config for pref migration in 64-bit builds. b=517407 r=mstange r=vlad

browser/components/migration/src/nsSafariProfileMigrator.cpp

@@ -1254,15 +1254,16 @@ nsSafariProfileMigrator::GetSourceHomePageURL(nsACString& aResult)
 
   // Let's first check if there's a home page key in the com.apple.safari file...
   CFDictionaryRef safariPrefs = CopySafariPrefs();
-  if (GetDictionaryCStringValue(safariPrefs,
-                                CFSTR(SAFARI_HOME_PAGE_PREF),
-                                aResult, kCFStringEncodingUTF8)) {
-    ::CFRelease(safariPrefs);
-    return NS_OK;
-  }
-
+  PRBool foundPref = GetDictionaryCStringValue(safariPrefs,
+                                               CFSTR(SAFARI_HOME_PAGE_PREF),
+                                               aResult, kCFStringEncodingUTF8);
   ::CFRelease(safariPrefs);
+  if (foundPref)
+    return NS_OK;
 
+#ifdef __LP64__
+  return NS_ERROR_FAILURE;
+#else
   // Couldn't find the home page in com.apple.safai, time to check
   // com.apple.internetconfig for this key!
   ICInstance internetConfig;
@@ -1284,4 +1285,5 @@ nsSafariProfileMigrator::GetSourceHomePageURL(nsACString& aResult)
   ::ICStop(internetConfig);
 
   return NS_OK;
+#endif
 }