Backed out changeset 047961bdb4ad (bug 1265708)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 04 Jun 2016 09:24:15 +0200
changeset 339394 710bda4e42c63a0cc4654e91fbaf8e2c6911de0b
parent 339393 130b03d8de240e36a2a80cd9117fcf04eb3bb3ba
child 339395 5cdc84e272d574ba1b8614e0d6f1823a59e4048b
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1265708
milestone49.0a1
backs out047961bdb4adf91179be3b8a983cffc0d8e9debb
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 047961bdb4ad (bug 1265708)
mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
@@ -1,17 +1,16 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package org.mozilla.gecko.db;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -120,17 +119,17 @@ public class LocalURLMetadata implements
     }
 
     /**
      * Returns an unmodifiable Map of url->Metadata (i.e. A second HashMap) for a list of urls.
      * Must not be called from UI or Gecko threads.
      */
     @Override
     public Map<String, Map<String, Object>> getForURLs(final ContentResolver cr,
-                                                       final Collection<String> urls,
+                                                       final List<String> urls,
                                                        final List<String> requestedColumns) {
         ThreadUtils.assertNotOnUiThread();
         ThreadUtils.assertNotOnGeckoThread();
 
         final Map<String, Map<String, Object>> data = new HashMap<String, Map<String, Object>>();
 
         // Nothing to query for
         if (urls.isEmpty() || requestedColumns.isEmpty()) {
--- a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
@@ -39,17 +39,17 @@ class StubURLMetadata implements URLMeta
     public StubURLMetadata() {
     }
 
     public Map<String, Object> fromJSON(JSONObject obj) {
         return new HashMap<String, Object>();
     }
 
     public Map<String, Map<String, Object>> getForURLs(final ContentResolver cr,
-                                                       final Collection<String> urls,
+                                                       final List<String> urls,
                                                        final List<String> columns) {
         return new HashMap<String, Map<String, Object>>();
     }
 
     public void save(final ContentResolver cr, final Map<String, Object> data) {
     }
 }
 
--- a/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java
@@ -1,22 +1,21 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package org.mozilla.gecko.db;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 import org.json.JSONObject;
 
 import android.content.ContentResolver;
 
 public interface URLMetadata {
     public Map<String, Object> fromJSON(JSONObject obj);
     public Map<String, Map<String, Object>> getForURLs(final ContentResolver cr,
-                                                       final Collection<String> urls,
+                                                       final List<String> urls,
                                                        final List<String> columns);
     public void save(final ContentResolver cr, final Map<String, Object> data);
 }