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

ios/chrome/browser/ui/BUILD.gn

Index: ios/chrome/browser/ui/BUILD.gn
diff --git a/ios/chrome/browser/ui/BUILD.gn b/ios/chrome/browser/ui/BUILD.gn
index 96380824dbad54ed96bc07faf083fdac598e0c57..d68a845296232b73fa531b16d1519027b544df69 100644
--- a/ios/chrome/browser/ui/BUILD.gn
+++ b/ios/chrome/browser/ui/BUILD.gn
@@ -4,18 +4,6 @@
 
 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 = [
@@ -35,6 +23,8 @@ source_set("ui") {
     "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",
@@ -65,13 +55,7 @@ source_set("ui") {
     "//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",