Bug 1360047 - Generate random GUIDs more reliably in TestFxAccountDeviceListUpdater. r=eoger

MozReview-Commit-ID: 9Ak99iIxOzY

--HG--
extra : rebase_source : 784fe09fadff525affb81563deb3044b5d8ca859

mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/devices/TestFxAccountDeviceListUpdater.java

@@ -27,6 +27,7 @@ import org.mozilla.gecko.fxa.login.State;
 import org.robolectric.shadows.ShadowContentResolver;
 
 import java.util.List;
+import java.util.UUID;
 
 import static java.util.Objects.deepEquals;
 import static org.junit.Assert.assertEquals;
@@ -176,7 +177,7 @@ public class TestFxAccountDeviceListUpdater {
     private ContentValues createMockRemoteClientValues(String name) {
         final long now = System.currentTimeMillis();
         ContentValues cli = new ContentValues();
-        cli.put(BrowserContract.RemoteDevices.GUID, "R" + Math.floor(Math.random() * 10));
+        cli.put(BrowserContract.RemoteDevices.GUID, UUID.randomUUID().toString());
         cli.put(BrowserContract.RemoteDevices.NAME, name);
         cli.put(BrowserContract.RemoteDevices.TYPE, "mobile");
         cli.put(BrowserContract.RemoteDevices.IS_CURRENT_DEVICE, false);