Bug 749930 - Replace uses of nsILocalFile with nsIFile (more C++ bits); r=Neil

toolkit/profile/nsToolkitProfileService.cpp

@@ -382,13 +382,9 @@ nsToolkitProfileService::Init()
     rv = gDirServiceProvider->GetUserLocalDataDirectory(getter_AddRefs(mTempData));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsCOMPtr<nsIFile> listFile;
+    rv = mAppData->Clone(getter_AddRefs(mListFile));
-    rv = mAppData->Clone(getter_AddRefs(listFile));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    mListFile = do_QueryInterface(listFile);
-    NS_ENSURE_TRUE(listFile, NS_ERROR_NO_INTERFACE);
-
     rv = mListFile->AppendNative(NS_LITERAL_CSTRING("profiles.ini"));
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -399,7 +395,7 @@ nsToolkitProfileService::Init()
     }
 
     PRInt64 size;
-    rv = listFile->GetFileSize(&size);
+    rv = mListFile->GetFileSize(&size);
     if (NS_FAILED(rv) || !size) {
         return NS_OK;
     }
@@ -727,15 +723,11 @@ nsToolkitProfileService::CreateProfileInternal(nsIFile* aRootDir,
 
     nsCAutoString dirName;
     if (!rootDir) {
-        nsCOMPtr<nsIFile> file;
+        rv = gDirServiceProvider->GetUserProfilesRootDir(getter_AddRefs(rootDir),
-        rv = gDirServiceProvider->GetUserProfilesRootDir(getter_AddRefs(file),
                                                          aProfileName, aAppName,
                                                          aVendorName);
         NS_ENSURE_SUCCESS(rv, rv);
 
-        rootDir = do_QueryInterface(file);
-        NS_ENSURE_TRUE(rootDir, NS_ERROR_UNEXPECTED);
-
         dirName = aName;
         SaltProfileName(dirName);
 
@@ -753,16 +745,12 @@ nsToolkitProfileService::CreateProfileInternal(nsIFile* aRootDir,
             localDir = aRootDir;
         }
         else {
-            nsCOMPtr<nsIFile> file;
+            rv = gDirServiceProvider->GetUserProfilesLocalDir(getter_AddRefs(localDir),
-            rv = gDirServiceProvider->GetUserProfilesLocalDir(getter_AddRefs(file),
                                                               aProfileName,
                                                               aAppName,
                                                               aVendorName);
             NS_ENSURE_SUCCESS(rv, rv);
 
-            localDir = do_QueryInterface(file);
-            NS_ENSURE_TRUE(localDir, NS_ERROR_UNEXPECTED);
-
             // use same salting
             if (NS_IsNativeUTF8()) {
                 localDir->AppendNative(dirName);