Lots of misc bug fixes to make the GN build of ios work again.

components/sessions/BUILD.gn

Index: components/sessions/BUILD.gn
diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index b9f043e63c019dba4024af0c898091de17e3e164..8d07d3b1578cfb8ee31416f54979454dbf48937a 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -51,11 +51,11 @@ if (!is_ios) {
 
     public_deps = [
       ":shared",
+      "//ios/web",
     ]
 
     deps = [
       "//base",
-      # '../ios/web/ios_web.gyp:ios_web',  TODO(GYP) iOS.
     ]
   }
 }
@@ -150,20 +150,29 @@ source_set("test_support") {
   }
 }
 
-if (!is_ios && !is_android) {
+if (!is_android) {
   source_set("unit_tests") {
     testonly = true
     sources = [
-      "content/content_serialized_navigation_builder_unittest.cc",
-      "content/content_serialized_navigation_driver_unittest.cc",
       "core/serialized_navigation_entry_unittest.cc",
       "core/session_backend_unittest.cc",
       "core/session_types_unittest.cc",
       "ios/ios_serialized_navigation_builder_unittest.cc",
       "ios/ios_serialized_navigation_driver_unittest.cc",
     ]
-    deps = [
+
+    if (!is_ios) {
+      sources += [
+        "content/content_serialized_navigation_builder_unittest.cc",
+        "content/content_serialized_navigation_driver_unittest.cc",
+      ]
+    }
+
+    public_deps = [
       ":sessions",
+    ]
+
+    deps = [
       ":test_support",
       "//base/test:test_support",
       "//testing/gtest",