Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/toolchain/mac/BUILD.gn

 # Copyright (c) 2013 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.
 
 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
 # some enhancements since the commands on Mac are slightly different than on
 # Linux.
 
 import("../goma.gni")
 
@@ skipping 176 matching lines @@
       command = "touch {{output}}"
       description = "STAMP {{output}}"
     }
 
     tool("copy") {
       command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
       description = "COPY {{source}} {{output}}"
     }
 
     toolchain_args() {
-      current_os = invoker.toolchain_os
-
-      # TODO(dpranke): os is here for backwards compatibility.
-      os = current_os
+      os = invoker.toolchain_os
     }
   }
 }
 
 # Toolchain representing the target build (either mac or iOS).
 mac_clang_toolchain("clang") {
-  toolchain_os = current_os
+  toolchain_os = os
 }
 
 # This toolchain provides a way for iOS target compiles to reference targets
 # compiled for the host system. It just overrides the OS back to "mac".
 mac_clang_toolchain("host_clang") {
   toolchain_os = "mac"
 }