Backed out changeset 5fdf628512a0 (bug 1614434) for build bustages on a CLOSED TREE

toolkit/components/url-classifier/tests/gtest/Common.cpp

@@ -192,6 +192,18 @@ void CheckContent(LookupCacheV4* aCache, const _PrefixArray& aPrefixArray) {
   }
 }
 
+static nsresult BuildCache(LookupCacheV2* cache,
+                           const _PrefixArray& aPrefixArray) {
+  AddPrefixArray prefixes;
+  AddCompleteArray completions;
+  nsresult rv = PrefixArrayToAddPrefixArray(aPrefixArray, prefixes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  return cache->Build(prefixes, completions);
+}
+
 static nsresult BuildCache(LookupCacheV4* cache,
                            const _PrefixArray& aPrefixArray) {
   PrefixStringMap map;
@@ -213,6 +225,23 @@ RefPtr<T> SetupLookupCache(const _PrefixArray& aPrefixArray,
   return cache;
 }
 
+template <typename T>
+RefPtr<T> SetupLookupCache(const _PrefixArray& aPrefixArray) {
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
+
+  file->AppendNative(GTEST_SAFEBROWSING_DIR);
+
+  RefPtr<T> cache = new T(GTEST_TABLE_V4, EmptyCString(), file);
+  nsresult rv = cache->Init();
+  EXPECT_EQ(rv, NS_OK);
+
+  rv = BuildCache(cache, aPrefixArray);
+  EXPECT_EQ(rv, NS_OK);
+
+  return cache;
+}
+
 nsresult BuildLookupCache(const RefPtr<Classifier>& classifier,
                           const nsACString& aTable,
                           _PrefixArray& aPrefixArray) {