Bug 1122691: Skip ClassifyLocal unless tracking protection is enabled (r=mcmanus,gcp)

2015-01-21 11:33:07 -08:00
parent a802c6ee08
commit 32f2349c1e
5 changed files with 57 additions and 35 deletions
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -1132,6 +1132,9 @@ nsUrlClassifierDBService::Init()
  if (NS_FAILED(rv)) {
    rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                                getter_AddRefs(cacheDir));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
  }

  // Start the background thread.