Remove OS(IOS) and OS(MAC_OS_X) guards.

Tools/DumpRenderTree/chromium/TestShell.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 117 matching lines @@
     // timed-out DRT process was crashed.
     m_timeout = 30 * 1000;
 }
 
 void TestShell::initialize(MockPlatform* platformSupport)
 {
     m_testInterfaces = adoptPtr(new WebTestInterfaces());
     platformSupport->setInterfaces(m_testInterfaces.get());
     m_devToolsTestInterfaces = adoptPtr(new WebTestInterfaces());
     m_prerenderingSupport = adoptPtr(new MockWebPrerenderingSupport());
-#if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(MAC_OS_X))
+#if !defined(USE_DEFAULT_RENDER_THEME) && (OS(WINDOWS) || OS(DARWIN))
     // Set theme engine.
     webkit_support::SetThemeEngine(m_testInterfaces->themeEngine());
 #endif
 
     WTF::initializeThreading();
 
     if (m_threadedCompositingEnabled)
         m_webCompositorThread = adoptPtr(WebKit::Platform::current()->createThread("Compositor"));
     webkit_support::SetThreadedCompositorEnabled(m_threadedCompositingEnabled);
 
@@ skipping 245 matching lines @@
     fflush(stderr);
 }
 
 void TestShell::dumpImage(SkCanvas* canvas) const
 {
     // Fix the alpha. The expected PNGs on Mac have an alpha channel, so we want
     // to keep it. On Windows, the alpha channel is wrong since text/form control
     // drawing may have erased it in a few places. So on Windows we force it to
     // opaque and also don't write the alpha channel for the reference. Linux
     // doesn't have the wrong alpha like Windows, but we match Windows.
-#if OS(MAC_OS_X)
+#if OS(DARWIN)
     bool discardTransparency = false;
 #else
     bool discardTransparency = true;
     makeCanvasOpaque(canvas);
 #endif
 
     const SkBitmap& sourceBitmap = canvas->getTopDevice()->accessBitmap(false);
     SkAutoLockPixels sourceBitmapLock(sourceBitmap);
 
     // Compute MD5 sum.
@@ skipping 140 matching lines @@
     for (size_t index = 0; index < entryCount; ++index) {
         WebHistoryItem historyItem = navigationController.entryAtIndex(index)->contentState();
         if (historyItem.isNull()) {
             historyItem.initialize();
             historyItem.setURLString(navigationController.entryAtIndex(index)->URL().spec().utf16());
         }
         result[index] = historyItem;
     }
     history->swap(result);
 }