Back out r269483 and the line of fixes that followed it.

base/mac/scoped_mach_vm.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MAC_SCOPED_MACH_VM_H_
 #define BASE_MAC_SCOPED_MACH_VM_H_
 
 #include <mach/mach.h>
+#include <mach/mach_vm.h>
 
 #include <algorithm>
 
-#include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "build/build_config.h"
-
-#if !defined(OS_IOS)
-#include <mach/mach_vm.h>
-#else  // OS_IOS
-// mach_vm.h is forbidden on iOS, but the routines in vm_map.h are a suitable
-// substitute.
-#include <mach/vm_map.h>
-#define mach_vm_address_t vm_address_t
-#define mach_vm_size_t vm_size_t
-#define mach_vm_deallocate vm_deallocate
-#endif  // OS_IOS
 
 // Use ScopedMachVM to supervise ownership of pages in the current process
 // through the Mach VM subsystem. Pages allocated with mach_vm_allocate can be
 // released when exiting a scope with ScopedMachVM.
 //
 // The Mach VM subsystem operates on a page-by-page basis, and a single VM
 // allocation managed by a ScopedMachVM object may span multiple pages. As far
 // as Mach is concerned, allocated pages may be deallocated individually. This
 // is in contrast to higher-level allocators such as malloc, where the base
 // address of an allocation implies the size of an allocated block.
@@ skipping 13 matching lines @@
 //   kern_return_t kr =
 //       mach_vm_allocate(mach_task_self(), &address, size, VM_FLAGS_ANYWHERE);
 //   if (kr != KERN_SUCCESS) {
 //     return false;
 //   }
 //   ScopedMachVM vm_owner(address, mach_vm_round_page(size));
 
 namespace base {
 namespace mac {
 
-class BASE_EXPORT ScopedMachVM {
+class ScopedMachVM {
  public:
   explicit ScopedMachVM(mach_vm_address_t address = 0, mach_vm_size_t size = 0)
       : address_(address),
         size_(size) {
     DCHECK(address % PAGE_SIZE == 0);
     DCHECK(size % PAGE_SIZE == 0);
   }
 
   ~ScopedMachVM() {
     if (size_) {
@@ skipping 24 matching lines @@
  private:
   mach_vm_address_t address_;
   mach_vm_size_t size_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedMachVM);
 };
 
 }  // namespace mac
 }  // namespace base
 
-#if defined(OS_IOS)
-#undef mach_vm_address_t
-#undef mach_vm_size_t
-#undef mach_vm_deallocate
-#endif  // OS_IOS
-
 #endif  // BASE_MAC_SCOPED_MACH_VM_H_