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

components/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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
 # Collection of all components. You wouldn't link to this, but this is rather
@@ skipping 12 matching lines @@
     "//components/chrome_apps",
     "//components/component_updater",
     "//components/compression",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/data_reduction_proxy/core/common",
     "//components/device_event_log",
     "//components/google/core/browser",
     "//components/search",
     "//components/search_engines",
+    "//components/sessions",
     "//components/sync_bookmarks",
     "//components/undo",
     "//components/strings",
     "//components/leveldb_proto",
     "//components/pref_registry",
     "//components/omnibox/browser",
     "//components/infobars/core",
     "//components/version_ui",
   ]
 
@@ skipping 71 matching lines @@
       "//components/power",
       "//components/precache/core",
       "//components/precache/content",
       "//components/proxy_config",
       "//components/query_parser",
       "//components/rappor",
       "//components/renderer_context_menu",
       "//components/resources:components_resources",
       "//components/search_provider_logos",
       "//components/security_interstitials/core",
-      "//components/sessions",
       "//components/signin/core/browser",
       "//components/ssl_config",
       "//components/startup_metric_utils",
       "//components/sync_driver",
       "//components/sync_sessions",
       "//components/tracing",
       "//components/tracing:startup_tracing",
       "//components/translate/content/browser",
       "//components/translate/content/common",
       "//components/translate/content/renderer",
@@ skipping 332 matching lines @@
 
     # TODO(GYP) need this target.
     #'breakpad/app/crash_keys_win_unittest.cc',
 
     if (enable_configuration_policy) {
       deps += [
         "//components/policy/core/browser:unit_tests",
         "//components/policy/core/common:unit_tests",
       ]
     }
+  } else {
+    deps += [ "//components/sessions:unit_tests" ]
   }
 
   if (toolkit_views) {
     # TODO bug 522654 Enable this when the undefined symbol is fixed in
     # web_modal such that this links.
     #deps += [ "//components/constrained_window:unit_tests" ]
   }
 
   if (is_win) {
     deps += [ "//components/browser_watcher:unit_tests" ]
@@ skipping 132 matching lines @@
   ]
   if (!is_ios) {
     deps += [
       "//base",
       "//base/test:test_support_perf",
       "//content/test:test_support",
       "//components/visitedlink/browser",
     ]
   }
 }