[iOS] ios/web no longer depends on content::BrowserThread.

ios/web/ios_web.gyp

Index: ios/web/ios_web.gyp
diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp
index 25490ee5d5dd6eaae766ce43648abec656af7b40..25491a67d31e451f0a0c31b49764fba4e3053e2a 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -15,7 +15,6 @@
       ],
       'dependencies': [
         'ios_web',
-        'ios_web_thread',
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../crypto/crypto.gyp:crypto',
@@ -35,10 +34,6 @@
         'public/app/web_main_parts.h',
       ],
     },
-    # Note: any embedder using ios_web will for now need to include either
-    # ios_web_thread (any new embedder) or ios_web_content_thread_shim (Chrome).
-    # This will become unnecessary once Chrome switches to using ios_web_thread,
-    # at which point that will be folded into this target.
     {
       # GN version: //ios/web
       'target_name': 'ios_web',
@@ -52,7 +47,6 @@
         'user_agent',
         '../../base/base.gyp:base',
         '../../components/url_formatter/url_formatter.gyp:url_formatter',
-        '../../content/content.gyp:content_browser',
         '../../ios/net/ios_net.gyp:ios_net',
         '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer',
         '../../net/net.gyp:net',
@@ -318,6 +312,8 @@
         'webui/web_ui_ios_data_source_impl.h',
         'webui/web_ui_ios_impl.h',
         'webui/web_ui_ios_impl.mm',
+        'web_thread_impl.cc',
+        'web_thread_impl.h',
       ],
       'link_settings': {
         # TODO(crbug.com/541549): change to regular linking once support for
@@ -329,42 +325,6 @@
         },
       },
     },
-    # Target that builds the actual WebThread implementation. This is a
-    # separate target since it can't yet be used by Chrome (see comment below).
-    {
-      'target_name': 'ios_web_thread',
-      'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../net/net.gyp:net',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'web_thread_impl.cc',
-        'web_thread_impl.h',
-      ],
-    },
-    # Target that builds the files that shim WebThread functions to their
-    # corresponding content equivalents. This is a separate target since it
-    # is needed by Chrome, which still uses content startup (which creates
-    # content threads), but isn't used by web_shell.
-    {
-      'target_name': 'ios_web_content_thread_shim',
-      'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../content/content.gyp:content_browser',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'web_thread_adapter.cc',
-        'web_thread_adapter.h',
-      ],
-    },
     # Target shared by ios_web and CrNet.
     {
       # GN version: //ios/web:core
@@ -471,51 +431,15 @@
     },
     {
       # GN version: //ios/web:test_support
-      'target_name': 'test_support_ios_web',
+      'target_name': 'ios_web_test_support',
       'type': 'static_library',
       'dependencies': [
-        'ios_web_thread',
-        'test_support_ios_web_without_threads',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'test/test_web_thread.cc',
-        'test/test_web_thread_bundle.cc',
-      ],
-    },
-    {
-      'target_name': 'test_support_ios_web_with_content_thread_shim',
-      'type': 'static_library',
-      'dependencies': [
-        'ios_web_content_thread_shim',
-        'test_support_ios_web_without_threads',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'test/test_web_thread_adapter.cc',
-        'test/test_web_thread_bundle_adapter.cc',
-      ],
-    },
-    # A test support target that does not include TestWebThread. This is
-    # separate because tests that rely on the the shim thread implementation
-    # can't use TestWebThread/TestWebThreadBundle.
-    # TODO(stuartmorgan): Fold this into test_support_ios_web once
-    # the WebThread-to-BrowserThread shim is gone.
-    {
-      'target_name': 'test_support_ios_web_without_threads',
-      'type': 'static_library',
-      'dependencies': [
-        'ios_web',
-        '../../content/content_shell_and_tests.gyp:test_support_content',
         '../../ios/testing/ios_testing.gyp:ocmock_support',
         '../../ios/third_party/gcdwebserver/gcdwebserver.gyp:gcdwebserver',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/ocmock/ocmock.gyp:ocmock',
+        'ios_web',
       ],
       'include_dirs': [
         '../..',
@@ -548,6 +472,8 @@
         'public/test/web_test_util.h',
         'test/crw_fake_web_controller_observer.h',
         'test/crw_fake_web_controller_observer.mm',
+        'test/test_web_thread.cc',
+        'test/test_web_thread_bundle.cc',
         'test/web_test.h',
         'test/web_test.mm',
         'test/web_test_suite.cc',