Commit 7736ba38 authored by Mike Dougherty's avatar Mike Dougherty Committed by Commit Bot

[iOS] Remove unused iOS version checks

Bug: 748410
Change-Id: I6ab9e1eabb776796342fdb94237d837fb309efd1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414777
Auto-Submit: Mike Dougherty <michaeldo@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807932}
parent f4a1aed8
...@@ -13,12 +13,6 @@ ...@@ -13,12 +13,6 @@
namespace base { namespace base {
namespace ios { namespace ios {
// Returns whether the operating system is iOS 10 or later.
BASE_EXPORT bool IsRunningOnIOS10OrLater();
// Returns whether the operating system is iOS 11 or later.
BASE_EXPORT bool IsRunningOnIOS11OrLater();
// Returns whether the operating system is iOS 12 or later. // Returns whether the operating system is iOS 12 or later.
BASE_EXPORT bool IsRunningOnIOS12OrLater(); BASE_EXPORT bool IsRunningOnIOS12OrLater();
......
...@@ -28,16 +28,6 @@ std::string* g_icudtl_path_override = nullptr; ...@@ -28,16 +28,6 @@ std::string* g_icudtl_path_override = nullptr;
namespace base { namespace base {
namespace ios { namespace ios {
bool IsRunningOnIOS10OrLater() {
static const bool is_running_on_or_later = IsRunningOnOrLater(10, 0, 0);
return is_running_on_or_later;
}
bool IsRunningOnIOS11OrLater() {
static const bool is_running_on_or_later = IsRunningOnOrLater(11, 0, 0);
return is_running_on_or_later;
}
bool IsRunningOnIOS12OrLater() { bool IsRunningOnIOS12OrLater() {
static const bool is_running_on_or_later = IsRunningOnOrLater(12, 0, 0); static const bool is_running_on_or_later = IsRunningOnOrLater(12, 0, 0);
return is_running_on_or_later; return is_running_on_or_later;
......
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#if defined(OS_IOS)
#include "base/ios/ios_util.h"
#endif
namespace base { namespace base {
namespace trace_event { namespace trace_event {
...@@ -512,13 +508,6 @@ TEST(ProcessMemoryDumpTest, MAYBE_CountResidentBytes) { ...@@ -512,13 +508,6 @@ TEST(ProcessMemoryDumpTest, MAYBE_CountResidentBytes) {
#define MAYBE_CountResidentBytesInSharedMemory CountResidentBytesInSharedMemory #define MAYBE_CountResidentBytesInSharedMemory CountResidentBytesInSharedMemory
#endif #endif
TEST(ProcessMemoryDumpTest, MAYBE_CountResidentBytesInSharedMemory) { TEST(ProcessMemoryDumpTest, MAYBE_CountResidentBytesInSharedMemory) {
#if defined(OS_IOS)
// TODO(crbug.com/748410): Reenable this test.
if (!base::ios::IsRunningOnIOS10OrLater()) {
return;
}
#endif
const size_t page_size = ProcessMemoryDump::GetSystemPageSize(); const size_t page_size = ProcessMemoryDump::GetSystemPageSize();
// Allocate few page of dirty memory and check if it is resident. // Allocate few page of dirty memory and check if it is resident.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment