Merge //ios/chrome/browser/ui:{ui,ui_arc} targets.

ios/chrome/browser/ui/BUILD.gn

 # Copyright 2016 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/ios/rules.gni")
 
-source_set("ui_arc") {
-  sources = [
-    "network_activity_indicator_manager.h",
-    "network_activity_indicator_manager.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "UIView+SizeClassSupport.h",
     "UIView+SizeClassSupport.mm",
     "animation_util.h",
     "animation_util.mm",
     "background_generator.h",
     "background_generator.mm",
     "browser_otr_state.h",
     "browser_otr_state.mm",
     "favicon_view.h",
     "favicon_view.mm",
     "file_locations.h",
     "file_locations.mm",
     "image_util.h",
     "image_util.mm",
     "native_content_controller.h",
     "native_content_controller.mm",
+    "network_activity_indicator_manager.h",
+    "network_activity_indicator_manager.mm",
     "orientation_limiting_navigation_controller.h",
     "orientation_limiting_navigation_controller.mm",
     "prerender_final_status.h",
     "reversed_animation.h",
     "reversed_animation.mm",
     "rtl_geometry.h",
     "rtl_geometry.mm",
     "show_mail_composer_util.h",
     "show_mail_composer_util.mm",
     "show_privacy_settings_util.h",
@@ skipping 10 matching lines @@
     "//base",
     "//base:i18n",
     "//ios/chrome/browser",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/ui/commands",
     "//ios/public/provider/chrome/browser",
     "//ios/web",
     "//ui/base",
     "//ui/gfx",
   ]
-  public_deps = [
-    ":ui_arc",
-  ]
-  allow_circular_includes_from = [
-    ":ui_arc",
-    "//ios/chrome/browser/ui/commands",
-  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/commands" ]
   libs = [
     "Accelerate.framework",
     "CoreGraphics.framework",
     "QuartzCore.framework",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ skipping 83 matching lines @@
     "//components/resources/terms/terms_tr.html",
     "//components/resources/terms/terms_uk.html",
     "//components/resources/terms/terms_vi.html",
     "//components/resources/terms/terms_zh-CN.html",
     "//components/resources/terms/terms_zh-TW.html",
   ]
   outputs = [
     "{{bundle_resources_dir}}/{{source_file_part}}",
   ]
 }