[ObjC ARC] Converts the rest of ios/web to ARC.

ios/web/BUILD.gn

Index: ios/web/BUILD.gn
diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn
index 7749b562bca11dd7382a847d16026c40253748bf..a2583402e5381625e31f2cb7b869b8f3b3e265b7 100644
--- a/ios/web/BUILD.gn
+++ b/ios/web/BUILD.gn
@@ -7,7 +7,7 @@ import("//ios/web/js_compile.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
-source_set("web_arc") {
+source_set("web") {
   deps = [
     ":core",
     ":js_resources",
@@ -216,6 +216,21 @@ source_set("web_arc") {
     "web_state/ui/wk_web_view_configuration_provider.mm",
     "web_state/web_controller_observer_bridge.h",
     "web_state/web_controller_observer_bridge.mm",
+    "web_state/web_state.mm",
+    "web_state/web_state_delegate.mm",
+    "web_state/web_state_delegate_bridge.mm",
+    "web_state/web_state_facade_delegate.h",
+    "web_state/web_state_impl.h",
+    "web_state/web_state_impl.mm",
+    "web_state/web_state_observer.mm",
+    "web_state/web_state_observer_bridge.mm",
+    "web_state/web_state_policy_decider.mm",
+    "web_state/web_state_weak_ptr_factory.h",
+    "web_state/web_state_weak_ptr_factory.mm",
+    "web_state/web_view_internal_creation_util.h",
+    "web_state/web_view_internal_creation_util.mm",
+    "web_state/wk_web_view_security_util.h",
+    "web_state/wk_web_view_security_util.mm",
     "web_thread_impl.cc",
     "web_thread_impl.h",
     "web_view_creation_util.mm",
@@ -245,61 +260,12 @@ source_set("web_arc") {
     "webui/web_ui_ios_impl.h",
     "webui/web_ui_ios_impl.mm",
   ]
-
-  libs = [ "WebKit.framework" ]
-
   configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("web") {
-  deps = [
-    ":core",
-    ":js_resources",
-    ":resources",
-    ":user_agent",
-    "//base",
-    "//components/url_formatter",
-    "//ios/net",
-    "//ios/third_party/blink:html_tokenizer",
-    "//mojo/public/cpp/system",
-    "//mojo/public/js",
-    "//net",
-    "//services/service_manager/public/cpp",
-    "//ui/base",
-    "//ui/gfx",
-    "//ui/gfx/geometry:geometry",
-    "//ui/resources",
-    "//url",
-  ]
-
-  public_deps = [
-    ":web_arc",
-  ]
-
-  sources = [
-    "web_state/web_state.mm",
-    "web_state/web_state_delegate.mm",
-    "web_state/web_state_delegate_bridge.mm",
-    "web_state/web_state_facade_delegate.h",
-    "web_state/web_state_impl.h",
-    "web_state/web_state_impl.mm",
-    "web_state/web_state_observer.mm",
-    "web_state/web_state_observer_bridge.mm",
-    "web_state/web_state_policy_decider.mm",
-    "web_state/web_state_weak_ptr_factory.h",
-    "web_state/web_state_weak_ptr_factory.mm",
-    "web_state/web_view_internal_creation_util.h",
-    "web_state/web_view_internal_creation_util.mm",
-    "web_state/wk_web_view_security_util.h",
-    "web_state/wk_web_view_security_util.mm",
-  ]
 
   libs = [
     "CoreGraphics.framework",
     "WebKit.framework",
   ]
-
-  allow_circular_includes_from = [ ":web_arc" ]
 }
 
 source_set("core") {