(Reland) Update all Robolectric tests to Robolectric 3.0

third_party/robolectric/BUILD.gn

Index: third_party/robolectric/BUILD.gn
diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
index 4eba3000a5b93321723d83d0c69432aa233c3d88..2f083a6856d50e2b080f51fe935eb36377341f21 100644
--- a/third_party/robolectric/BUILD.gn
+++ b/third_party/robolectric/BUILD.gn
@@ -24,23 +24,7 @@ java_prebuilt("android-all-5.0.0_r2-robolectric-1") {
   jar_path = "lib/android-all-5.0.0_r2-robolectric-1.jar"
 }
 
-# TODO(mikecase): Remove this target once all tests have been converted to
-# Robolectric 3.0.
-# GYP: //third_party/robolectric/robolectric.gyp:robolectric_jar
-java_prebuilt("robolectric_java") {
-  testonly = true
-  jar_path = "lib/robolectric-2.4-jar-with-dependencies.jar"
-  deps = [
-    ":android-all-4.3_r2-robolectric-0",
-    ":json-20080701",
-    ":tagsoup-1.2",
-  ]
-}
-
-# TODO(mikecase): Rename target to robolectric_java once all tests have been
-# converted to Robolectric 3.0 and the old robolectric_java target has been
-# removed.
-java_library("robolectric_3_java") {
+java_library("robolectric_java") {
   testonly = true
   deps = [
     ":android-all-5.0.0_r2-robolectric-1",
@@ -594,7 +578,7 @@ template("shadows_core") {
       "robolectric/robolectric-shadows/resources/META-INF/services/org.robolectric.internal.ShadowProvider",
       "robolectric/robolectric-shadows/shadows-core/src/main/resources/META-INF/services/org.robolectric.ShadowsAdapter",
     ]
-    if (is_linux) {
+    if (host_os == "linux") {
       additional_jar_files = [
         rebase_path("../sqlite4java/lib/linux-x86_64/libsqlite4java.so") +
             ":linux-x86_64/libsqlite4java.so",
@@ -602,12 +586,12 @@ template("shadows_core") {
             ":linux-x86/libsqlite4java.so",
       ]
     }
-    if (is_mac) {
+    if (host_os == "mac") {
       additional_jar_files =
           [ rebase_path("../sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib") +
             ":mac-x86_64/libsqlite4java.jnilib" ]
     }
-    if (is_win) {
+    if (host_os == "win") {
       additional_jar_files = [
         rebase_path("../sqlite4java/lib/windows-x86/sqlite4java.dll") +
             ":windows-x86/sqlite4java.dll",