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

components/sessions/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 config("implementation") {
   defines = [ "SESSIONS_IMPLEMENTATION" ]
@@ skipping 33 matching lines @@
       "ios/ios_live_tab.cc",
       "ios/ios_live_tab.h",
       "ios/ios_serialized_navigation_builder.cc",
       "ios/ios_serialized_navigation_builder.h",
       "ios/ios_serialized_navigation_driver.cc",
       "ios/ios_serialized_navigation_driver.h",
     ]
 
     public_deps = [
       ":shared",
+      "//ios/web",
     ]
 
     deps = [
       "//base",
-      # '../ios/web/ios_web.gyp:ios_web',  TODO(GYP) iOS.
     ]
   }
 }
 
 # Sources shared between the content and iOS implementations.
 source_set("shared") {
   visibility = [ ":*" ]
 
   sources = [
     "core/base_session_service.cc",
@@ skipping 74 matching lines @@
   ]
 
   if (!is_android && !is_ios) {
     sources += [
       "core/base_session_service_test_helper.cc",
       "core/base_session_service_test_helper.h",
     ]
   }
 }
 
-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",
     ]
+
+    if (!is_ios) {
+      sources += [
+        "content/content_serialized_navigation_builder_unittest.cc",
+        "content/content_serialized_navigation_driver_unittest.cc",
+      ]
+    }
+
+    public_deps = [
+      ":sessions",
+    ]
+
     deps = [
-      ":sessions",
       ":test_support",
       "//base/test:test_support",
       "//testing/gtest",
     ]
   }
 }