Remove iOS ifdefs in src/content.

CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1815563004

Cr-Commit-Position: refs/heads/master@{#382296}

16 files changed, 24 insertions, 53 deletions

diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index 16fd804..57f04f7 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -6,15 +6,13 @@
 
 #include "build/build_config.h"
 
-#if !defined(CHROME_MULTIPLE_DLL_CHILD)
-#include "content/public/browser/content_browser_client.h"
-#endif
-
-#if !defined(OS_IOS)
 #include "content/public/gpu/content_gpu_client.h"
 #include "content/public/plugin/content_plugin_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/utility/content_utility_client.h"
+
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+#include "content/public/browser/content_browser_client.h"
 #endif
 
 namespace content {
@@ -29,7 +27,7 @@ int ContentMainDelegate::RunProcess(
   return -1;
 }
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
 
 bool ContentMainDelegate::ProcessRegistersWithSystemProcess(
     const std::string& process_type) {
@@ -45,7 +43,7 @@ bool ContentMainDelegate::DelaySandboxInitialization(
   return false;
 }
 
-#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
 
 void ContentMainDelegate::ZygoteStarting(
     ScopedVector<ZygoteForkDelegate>* delegates) {
@@ -66,7 +64,7 @@ ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
 }
 
 ContentGpuClient* ContentMainDelegate::CreateContentGpuClient() {
-#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentGpuClient();
@@ -74,7 +72,7 @@ ContentGpuClient* ContentMainDelegate::CreateContentGpuClient() {
 }
 
 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
-#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentPluginClient();
@@ -82,7 +80,7 @@ ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
 }
 
 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentRendererClient();
@@ -90,7 +88,7 @@ ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
 }
 
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
-#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentUtilityClient();
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
index 7fecaea..5155af88 100644
--- a/content/public/app/content_main_delegate.h
+++ b/content/public/app/content_main_delegate.h
@@ -50,7 +50,7 @@ class CONTENT_EXPORT ContentMainDelegate {
   // Called right before the process exits.
   virtual void ProcessExiting(const std::string& process_type) {}
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
   // Returns true if the process registers with the system monitor, so that we
   // can allocate an IO port for it before the sandbox is initialized. Embedders
   // are called only for process types that content doesn't know about.
@@ -67,7 +67,7 @@ class CONTENT_EXPORT ContentMainDelegate {
   // want it at all.
   virtual bool DelaySandboxInitialization(const std::string& process_type);
 
-#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
   // Tells the embedder that the zygote process is starting, and allows it to
   // specify one or more zygote delegates if it wishes by storing them in
   // |*delegates|.
diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h
index 1593546..07193af 100644
--- a/content/public/browser/browser_child_process_host.h
+++ b/content/public/browser/browser_child_process_host.h
@@ -14,7 +14,7 @@
 #include "content/public/common/process_type.h"
 #include "ipc/ipc_sender.h"
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
 #include "base/process/port_provider_mac.h"
 #endif
 
@@ -85,7 +85,7 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender {
   // nullptr if no service registry exists.
   virtual ServiceRegistry* GetServiceRegistry() = 0;
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
   // Returns a PortProvider used to get the task port for child processes.
   static base::PortProvider* GetPortProvider();
 #endif
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 76d6de2..a540ee0e 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -395,9 +395,7 @@ class NavigationController {
 
   // Random --------------------------------------------------------------------
 
-  // Session storage depends on dom_storage that depends on blink::WebString,
-  // which cannot be used on iOS.
-#if !defined(OS_IOS)
+  // Session storage depends on dom_storage that depends on blink::WebString.
   // Returns all the SessionStorageNamespace objects that this
   // NavigationController knows about, the map key is a StoragePartition id.
   virtual const SessionStorageNamespaceMap&
@@ -406,7 +404,6 @@ class NavigationController {
   // TODO(ajwong): Remove this once prerendering, instant, and session restore
   // are migrated.
   virtual SessionStorageNamespace* GetDefaultSessionStorageNamespace() = 0;
-#endif
 
   // Sets the max restored page ID this NavigationController has seen, if it
   // was restored from a previous session.
diff --git a/content/public/browser/resource_context.h b/content/public/browser/resource_context.h
index e96f7c2..5a9419b 100644
--- a/content/public/browser/resource_context.h
+++ b/content/public/browser/resource_context.h
@@ -33,9 +33,7 @@ class AppCacheService;
 // the UI thread. It must be destructed on the IO thread.
 class CONTENT_EXPORT ResourceContext : public base::SupportsUserData {
  public:
-#if !defined(OS_IOS)
   ResourceContext();
-#endif
   ~ResourceContext() override;
   virtual net::HostResolver* GetHostResolver() = 0;
 
diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc
index 34350d5..49682c6 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -108,7 +108,7 @@ std::string ContentClient::GetProcessTypeNameInEnglish(int type) {
   return std::string();
 }
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
 bool ContentClient::GetSandboxProfileForSandboxType(
     int sandbox_type,
     int* sandbox_profile_resource_id) const {
diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
index ba15b3e..3699415 100644
--- a/content/public/common/content_client.h
+++ b/content/public/common/content_client.h
@@ -125,7 +125,7 @@ class CONTENT_EXPORT ContentClient {
   // doesn't know about because they're from the embedder.
   virtual std::string GetProcessTypeNameInEnglish(int type);
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
   // Allows the embedder to define a new |sandbox_type| by mapping it to the
   // resource ID corresponding to the sandbox profile to use. The legal values
   // for |sandbox_type| are defined by the embedder and should start with
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index cc8d762..b7786ec 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -982,7 +982,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
 const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher";
 #endif
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
 // Disables support for Core Animation plugins. This is triggered when
 // accelerated compositing is disabled. See http://crbug.com/122430.
 const char kDisableCoreAnimationPlugins[] =
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 6e85102..8fd722e 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -286,7 +286,7 @@ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
 CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
 #endif
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MACOSX)
 extern const char kDisableCoreAnimationPlugins[];
 extern const char kDisableThreadedEventHandlingMac[];
 #endif
diff --git a/content/public/common/url_utils.cc b/content/public/common/url_utils.cc
index 40cd67c..4133cb0 100644
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -16,10 +16,7 @@ const char* const* GetSavableSchemes() {
 }
 
 bool HasWebUIScheme(const GURL& url) {
-  return
-#if !defined(OS_IOS)
-         url.SchemeIs(kChromeDevToolsScheme) ||
-#endif
+  return url.SchemeIs(kChromeDevToolsScheme) ||
          url.SchemeIs(kChromeUIScheme);
 }
 
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 1b2914c..4c03f858 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -12,6 +12,9 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/utility_process_host_impl.h"
 #include "content/common/url_schemes.h"
 #include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/common/content_client.h"
@@ -20,14 +23,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 
-#if !defined(OS_IOS)
-#include "content/browser/gpu/gpu_process_host.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/browser/utility_process_host_impl.h"
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
 #include "gin/v8_initializer.h"
 #endif
-#endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -78,7 +76,7 @@ void ContentTestSuiteBase::Initialize() {
   // by tests.
   base::StatisticsRecorder::Initialize();
 
-#if !defined(OS_IOS) && defined(V8_USE_EXTERNAL_STARTUP_DATA)
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   gin::V8Initializer::LoadV8Snapshot();
   gin::V8Initializer::LoadV8Natives();
 #endif
@@ -118,13 +116,11 @@ void ContentTestSuiteBase::RegisterContentSchemes(
 }
 
 void ContentTestSuiteBase::RegisterInProcessThreads() {
-#if !defined(OS_IOS)
   UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
       CreateInProcessUtilityThread);
   RenderProcessHostImpl::RegisterRendererMainThreadFactory(
       CreateInProcessRendererThread);
   GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
-#endif
 }
 
 }  // namespace content
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index ff945b6..572e008 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -367,12 +367,10 @@ void RenderViewTest::SetUp() {
   view_params.min_size = gfx::Size();
   view_params.max_size = gfx::Size();
 
-#if !defined(OS_IOS)
   InitializeMojo();
   test_io_thread_.reset(new base::TestIOThread(base::TestIOThread::kAutoStart));
   ipc_support_.reset(
       new mojo::edk::test::ScopedIPCSupport(test_io_thread_->task_runner()));
-#endif
 
   // This needs to pass the mock render thread to the view.
   RenderViewImpl* view =
diff --git a/content/public/test/test_content_client_initializer.cc b/content/public/test/test_content_client_initializer.cc
index e19f4d8..66bf033 100644
--- a/content/public/test/test_content_client_initializer.cc
+++ b/content/public/test/test_content_client_initializer.cc
@@ -36,11 +36,9 @@ TestContentClientInitializer::~TestContentClientInitializer() {
 }
 
 void TestContentClientInitializer::CreateTestRenderViewHosts() {
-#if !defined(OS_IOS)
   rph_factory_.reset(new MockRenderProcessHostFactory());
   test_render_view_host_factory_.reset(
       new TestRenderViewHostFactory(rph_factory_.get()));
-#endif  // OS_IOS
 }
 
 }  // namespace content
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index 66a493a..2d12dd6 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -129,9 +129,7 @@ void RunThisRunLoop(base::RunLoop* run_loop) {
   // If we're running inside a browser test, we might need to allow the test
   // launcher to do extra work before/after running a nested message loop.
   TestLauncherDelegate* delegate = NULL;
-#if !defined(OS_IOS)
   delegate = GetCurrentTestLauncherDelegate();
-#endif
   if (delegate)
     delegate->PreRunMessageLoop(run_loop);
   run_loop->Run();
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index 10791ba..7c45d5c 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -8,6 +8,7 @@
 #include "base/rand_util.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
+#include "content/test/test_blink_web_unit_test_support.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
 #if defined(USE_AURA)
@@ -18,10 +19,6 @@
 #include <X11/Xlib.h>
 #endif
 
-#if !defined(OS_IOS)
-#include "content/test/test_blink_web_unit_test_support.h"
-#endif
-
 namespace content {
 
 UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
@@ -35,15 +32,11 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
   aura::Env::CreateInstance(create_event_source);
 #endif
   DCHECK(test_suite);
-#if !defined(OS_IOS)
   blink_test_support_.reset(new TestBlinkWebUnitTestSupport);
-#endif
 }
 
 UnitTestTestSuite::~UnitTestTestSuite() {
-#if !defined(OS_IOS)
   blink_test_support_.reset();
-#endif
 #if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
diff --git a/content/public/test/unittest_test_suite.h b/content/public/test/unittest_test_suite.h
index 680ea3c..1a0f46b 100644
--- a/content/public/test/unittest_test_suite.h
+++ b/content/public/test/unittest_test_suite.h
@@ -32,9 +32,7 @@ class UnitTestTestSuite {
  private:
   scoped_ptr<base::TestSuite> test_suite_;
 
-#if !defined(OS_IOS)
   scoped_ptr<TestBlinkWebUnitTestSupport> blink_test_support_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(UnitTestTestSuite);
 };